diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 15:03:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 15:03:04 -0400 |
commit | 080e89270a7bfb7d01fac9a67050f8ac6d6cdd11 (patch) | |
tree | 489e467292ca06420e85f185095323efb80c75b7 /arch/x86_64 | |
parent | 4b85df0419d1fb135d9d845876e8c7ee1393f83c (diff) | |
parent | 38bdc32af442b6ab09ed61b8b669072098c95dd2 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix:
mm/slab: fix section mismatch warning
mm: fix section mismatch warnings
init/main: use __init_refok to fix section mismatch
kbuild: introduce __init_refok/__initdata_refok to supress section mismatch warnings
all-archs: consolidate .data section definition in asm-generic
all-archs: consolidate .text section definition in asm-generic
kbuild: add "Section mismatch" warning whitelist for powerpc
kbuild: make better section mismatch reports on i386, arm and mips
kbuild: make modpost section warnings clearer
kconfig: search harder for curses library in check-lxdialog.sh
kbuild: include limits.h in sumversion.c for PATH_MAX
powerpc: Fix the MODALIAS generation in modpost for of devices
Diffstat (limited to 'arch/x86_64')
-rw-r--r-- | arch/x86_64/kernel/vmlinux.lds.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S index 88cfa50b424d..dbccfda8364f 100644 --- a/arch/x86_64/kernel/vmlinux.lds.S +++ b/arch/x86_64/kernel/vmlinux.lds.S | |||
@@ -31,7 +31,7 @@ SECTIONS | |||
31 | *(.bootstrap.text) | 31 | *(.bootstrap.text) |
32 | _stext = .; | 32 | _stext = .; |
33 | /* Then the rest */ | 33 | /* Then the rest */ |
34 | *(.text) | 34 | TEXT_TEXT |
35 | SCHED_TEXT | 35 | SCHED_TEXT |
36 | LOCK_TEXT | 36 | LOCK_TEXT |
37 | KPROBES_TEXT | 37 | KPROBES_TEXT |
@@ -55,7 +55,7 @@ SECTIONS | |||
55 | . = ALIGN(PAGE_SIZE); /* Align data segment to page size boundary */ | 55 | . = ALIGN(PAGE_SIZE); /* Align data segment to page size boundary */ |
56 | /* Data */ | 56 | /* Data */ |
57 | .data : AT(ADDR(.data) - LOAD_OFFSET) { | 57 | .data : AT(ADDR(.data) - LOAD_OFFSET) { |
58 | *(.data) | 58 | DATA_DATA |
59 | CONSTRUCTORS | 59 | CONSTRUCTORS |
60 | } :data | 60 | } :data |
61 | 61 | ||