← Back to branch summary

~jsvoboda/helenos/dnsr

« back to all changes in this revision

Viewing changes to kernel/arch/arm32/src/exception.c

  • Committer: Jiri Svoboda
  • Date: 2012-11-11 21:31:03 UTC
  • mfrom: (1527.1.178 mainline)
  • Revision ID: jiri@wiwaxia-20121111213103-314bmkettwvlwj97
Merge mainline changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel/arch/arm32/src/exception.c
122
122
        uint32_t control_reg;
123
123
        
124
124
        asm volatile (
125
 
                "mrc p15, 0, %[control_reg], c1, c1"
 
125
                "mrc p15, 0, %[control_reg], c1, c0"
126
126
                : [control_reg] "=r" (control_reg)
127
127
        );
128
128
        
130
130
        control_reg |= CP15_R1_HIGH_VECTORS_BIT;
131
131
        
132
132
        asm volatile (
133
 
                "mcr p15, 0, %[control_reg], c1, c1"
 
133
                "mcr p15, 0, %[control_reg], c1, c0"
134
134
                :: [control_reg] "r" (control_reg)
135
135
        );
136
136
}