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 /include/asm-generic/vmlinux.lds.h | |
| 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 'include/asm-generic/vmlinux.lds.h')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index f3806a74c478..8307b1bb337a 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -9,6 +9,11 @@ | |||
| 9 | /* Align . to a 8 byte boundary equals to maximum function alignment. */ | 9 | /* Align . to a 8 byte boundary equals to maximum function alignment. */ |
| 10 | #define ALIGN_FUNCTION() . = ALIGN(8) | 10 | #define ALIGN_FUNCTION() . = ALIGN(8) |
| 11 | 11 | ||
| 12 | /* .data section */ | ||
| 13 | #define DATA_DATA \ | ||
| 14 | *(.data) \ | ||
| 15 | *(.data.init.refok) | ||
| 16 | |||
| 12 | #define RODATA \ | 17 | #define RODATA \ |
| 13 | . = ALIGN(4096); \ | 18 | . = ALIGN(4096); \ |
| 14 | .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ | 19 | .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ |
| @@ -139,6 +144,13 @@ | |||
| 139 | VMLINUX_SYMBOL(__security_initcall_end) = .; \ | 144 | VMLINUX_SYMBOL(__security_initcall_end) = .; \ |
| 140 | } | 145 | } |
| 141 | 146 | ||
| 147 | /* .text section. Map to function alignment to avoid address changes | ||
| 148 | * during second ld run in second ld pass when generating System.map */ | ||
| 149 | #define TEXT_TEXT \ | ||
| 150 | ALIGN_FUNCTION(); \ | ||
| 151 | *(.text) \ | ||
| 152 | *(.text.init.refok) | ||
| 153 | |||
| 142 | /* sched.text is aling to function alignment to secure we have same | 154 | /* sched.text is aling to function alignment to secure we have same |
| 143 | * address even at second ld pass when generating System.map */ | 155 | * address even at second ld pass when generating System.map */ |
| 144 | #define SCHED_TEXT \ | 156 | #define SCHED_TEXT \ |
