diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:44:22 -0500 |
| commit | f8a6b2b9cee298a9663cbe38ce1eb5240987cb62 (patch) | |
| tree | b356490269c9e77d164dcc1477792b882fbb8bdb /arch/arm/kernel/entry-armv.S | |
| parent | ba1511bf7fbda452138e4096bf10d5a382710f4f (diff) | |
| parent | 071a0bc2ceace31266836801510879407a3701fa (diff) | |
Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/kernel/acpi/boot.c
arch/x86/mm/fault.c
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 77b047475539..85040cfeb5e5 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S | |||
| @@ -650,6 +650,7 @@ ENTRY(fp_enter) | |||
| 650 | no_fp: mov pc, lr | 650 | no_fp: mov pc, lr |
| 651 | 651 | ||
| 652 | __und_usr_unknown: | 652 | __und_usr_unknown: |
| 653 | enable_irq | ||
| 653 | mov r0, sp | 654 | mov r0, sp |
| 654 | adr lr, ret_from_exception | 655 | adr lr, ret_from_exception |
| 655 | b do_undefinstr | 656 | b do_undefinstr |