diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 11:58:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 11:58:23 -0400 |
| commit | edcda265225b90c8700b21758fffcba61d19e046 (patch) | |
| tree | 5bc62e95df24004c46b9893b636296091c2f824a /arch/arm/include/asm/entry-macro-multi.S | |
| parent | 9c317b3bed40fed07e2ed536afca3b58952ac432 (diff) | |
| parent | 111b20d01346b9635b3223c7af4e40e43bee8dc6 (diff) | |
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: pm: ensure ARMv7 CPUs save and restore the TLS register
ARM: pm: proc-v7: fix missing struct processor pointers for suspend code
ARM: 6969/1: plat-iop: fix build error
ARM: 6961/1: zImage: Add build-time check for correctly-sized proc_type entries
ARM: SMP: wait for CPU to be marked active
ARM: 6963/1: Thumb-2: Relax relocation requirements for non-function symbols
ARM: 6962/1: mach-h720x: fix build error
ARM: 6959/1: SMP build fix for entry-macro-multi.S
Diffstat (limited to 'arch/arm/include/asm/entry-macro-multi.S')
| -rw-r--r-- | arch/arm/include/asm/entry-macro-multi.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/entry-macro-multi.S b/arch/arm/include/asm/entry-macro-multi.S index ec0bbf79c71f..2da8547de6d6 100644 --- a/arch/arm/include/asm/entry-macro-multi.S +++ b/arch/arm/include/asm/entry-macro-multi.S | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | #include <asm/assembler.h> | ||
| 2 | |||
| 1 | /* | 3 | /* |
| 2 | * Interrupt handling. Preserves r7, r8, r9 | 4 | * Interrupt handling. Preserves r7, r8, r9 |
| 3 | */ | 5 | */ |