diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-29 08:46:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-29 08:47:05 -0400 |
| commit | e7fd5d4b3d240f42c30a9e3d20a4689c4d3a795a (patch) | |
| tree | 4ba588631dd8189a818a91c9e3976526071178b6 /arch/powerpc/kernel/head_fsl_booke.S | |
| parent | 1130b0296184bc21806225fd06d533515a99d2db (diff) | |
| parent | 56a50adda49b2020156616c4eb15353e0f9ad7de (diff) | |
Merge branch 'linus' into perfcounters/core
Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
the latest upstream fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/kernel/head_fsl_booke.S')
| -rw-r--r-- | arch/powerpc/kernel/head_fsl_booke.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S index 4c22620d009b..5bdcc06d294c 100644 --- a/arch/powerpc/kernel/head_fsl_booke.S +++ b/arch/powerpc/kernel/head_fsl_booke.S | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | * option) any later version. | 30 | * option) any later version. |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/init.h> | ||
| 33 | #include <linux/threads.h> | 34 | #include <linux/threads.h> |
| 34 | #include <asm/processor.h> | 35 | #include <asm/processor.h> |
| 35 | #include <asm/page.h> | 36 | #include <asm/page.h> |
| @@ -53,7 +54,7 @@ | |||
| 53 | * r7 - End of kernel command line string | 54 | * r7 - End of kernel command line string |
| 54 | * | 55 | * |
| 55 | */ | 56 | */ |
| 56 | .section .text.head, "ax" | 57 | __HEAD |
| 57 | _ENTRY(_stext); | 58 | _ENTRY(_stext); |
| 58 | _ENTRY(_start); | 59 | _ENTRY(_start); |
| 59 | /* | 60 | /* |