diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:31 -0400 |
| commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
| tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /arch/alpha/kernel/head.S | |
| parent | 19c1a6f5764d787113fa323ffb18be7991208f82 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/alpha/kernel/head.S')
| -rw-r--r-- | arch/alpha/kernel/head.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/alpha/kernel/head.S b/arch/alpha/kernel/head.S index 7ac1f1372c36..4bdd1d2ff353 100644 --- a/arch/alpha/kernel/head.S +++ b/arch/alpha/kernel/head.S | |||
| @@ -7,10 +7,11 @@ | |||
| 7 | * the kernel global pointer and jump to the kernel entry-point. | 7 | * the kernel global pointer and jump to the kernel entry-point. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/init.h> | ||
| 10 | #include <asm/system.h> | 11 | #include <asm/system.h> |
| 11 | #include <asm/asm-offsets.h> | 12 | #include <asm/asm-offsets.h> |
| 12 | 13 | ||
| 13 | .section .text.head, "ax" | 14 | __HEAD |
| 14 | .globl swapper_pg_dir | 15 | .globl swapper_pg_dir |
| 15 | .globl _stext | 16 | .globl _stext |
| 16 | swapper_pg_dir=SWAPPER_PGD | 17 | swapper_pg_dir=SWAPPER_PGD |