diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-04 23:27:43 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-04 23:27:43 -0500 |
| commit | 14d676f56fad26fd3c31eeff5d4ef8ea4a163571 (patch) | |
| tree | 5e740c5931daecf44a6e74c230f2deb291290f4b /arch/m32r/kernel/head.S | |
| parent | 797eaed40e1df4a3b9ece6894a71ce2b568bca38 (diff) | |
| parent | feaf3848a813a106f163013af6fcf6c4bfec92d9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/m32r/kernel/head.S')
| -rw-r--r-- | arch/m32r/kernel/head.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m32r/kernel/head.S b/arch/m32r/kernel/head.S index 40180778a5c7..90916067b9c1 100644 --- a/arch/m32r/kernel/head.S +++ b/arch/m32r/kernel/head.S | |||
| @@ -23,7 +23,7 @@ __INITDATA | |||
| 23 | /* | 23 | /* |
| 24 | * References to members of the boot_cpu_data structure. | 24 | * References to members of the boot_cpu_data structure. |
| 25 | */ | 25 | */ |
| 26 | .text | 26 | .section .text.head, "ax" |
| 27 | .global start_kernel | 27 | .global start_kernel |
| 28 | .global __bss_start | 28 | .global __bss_start |
| 29 | .global _end | 29 | .global _end |
| @@ -133,7 +133,6 @@ loop1: | |||
| 133 | /* | 133 | /* |
| 134 | * AP startup routine | 134 | * AP startup routine |
| 135 | */ | 135 | */ |
| 136 | .text | ||
| 137 | .global eit_vector | 136 | .global eit_vector |
| 138 | ENTRY(startup_AP) | 137 | ENTRY(startup_AP) |
| 139 | ;; setup EVB | 138 | ;; setup EVB |
| @@ -230,6 +229,7 @@ ENTRY(startup_AP) | |||
| 230 | nop | 229 | nop |
| 231 | #endif /* CONFIG_SMP */ | 230 | #endif /* CONFIG_SMP */ |
| 232 | 231 | ||
| 232 | .text | ||
| 233 | ENTRY(stack_start) | 233 | ENTRY(stack_start) |
| 234 | .long init_thread_union+8192 | 234 | .long init_thread_union+8192 |
| 235 | .long __KERNEL_DS | 235 | .long __KERNEL_DS |