diff options
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index be16a48007b4..22f0ed324f37 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S | |||
| @@ -19,7 +19,9 @@ | |||
| 19 | #include <asm/glue-df.h> | 19 | #include <asm/glue-df.h> |
| 20 | #include <asm/glue-pf.h> | 20 | #include <asm/glue-pf.h> |
| 21 | #include <asm/vfpmacros.h> | 21 | #include <asm/vfpmacros.h> |
| 22 | #ifndef CONFIG_MULTI_IRQ_HANDLER | ||
| 22 | #include <mach/entry-macro.S> | 23 | #include <mach/entry-macro.S> |
| 24 | #endif | ||
| 23 | #include <asm/thread_notify.h> | 25 | #include <asm/thread_notify.h> |
| 24 | #include <asm/unwind.h> | 26 | #include <asm/unwind.h> |
| 25 | #include <asm/unistd.h> | 27 | #include <asm/unistd.h> |
| @@ -1101,7 +1103,6 @@ __stubs_start: | |||
| 1101 | * get out of that mode without clobbering one register. | 1103 | * get out of that mode without clobbering one register. |
| 1102 | */ | 1104 | */ |
| 1103 | vector_fiq: | 1105 | vector_fiq: |
| 1104 | disable_fiq | ||
| 1105 | subs pc, lr, #4 | 1106 | subs pc, lr, #4 |
| 1106 | 1107 | ||
| 1107 | /*============================================================================= | 1108 | /*============================================================================= |