diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-08 13:52:00 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-08 13:52:00 +0100 |
| commit | 4d117c5c6b00254e51c61ff5b506ccaba21a5a03 (patch) | |
| tree | ecb9d3ee4bfd9610c459c1eb0c0357c2905f3ae4 /arch/m32r | |
| parent | sched: add uid information to sched_debug for CONFIG_USER_SCHED (diff) | |
| parent | sched: don't export sched_mc_power_savings in laptops (diff) | |
| download | linux-4d117c5c6b00254e51c61ff5b506ccaba21a5a03.tar.xz linux-4d117c5c6b00254e51c61ff5b506ccaba21a5a03.zip | |
Merge branch 'sched/urgent' into sched/core
Diffstat (limited to 'arch/m32r')
| -rw-r--r-- | arch/m32r/kernel/head.S | 4 | ||||
| -rw-r--r-- | arch/m32r/kernel/vmlinux.lds.S | 1 |
2 files changed, 3 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 /* * References to members of the boot_cpu_data structure. */ - .text +.section .text.head, "ax" .global start_kernel .global __bss_start .global _end @@ -133,7 +133,6 @@ loop1: /* * AP startup routine */ - .text .global eit_vector ENTRY(startup_AP) ;; setup EVB @@ -230,6 +229,7 @@ ENTRY(startup_AP) nop #endif /* CONFIG_SMP */ + .text ENTRY(stack_start) .long init_thread_union+8192 .long __KERNEL_DS diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S index 15a6f36c06db..9db05df20c0e 100644 --- a/arch/m32r/kernel/vmlinux.lds.S +++ b/arch/m32r/kernel/vmlinux.lds.S @@ -27,6 +27,7 @@ SECTIONS _text = .; /* Text and read-only data */ .boot : { *(.boot) } = 0 .text : { + *(.text.head) TEXT_TEXT SCHED_TEXT LOCK_TEXT |