diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 17:28:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 17:28:19 -0400 |
commit | efffbeee5bc4168059683714b300d307f5193d69 (patch) | |
tree | 7fde51080f4534a86bfa27a430aaf7ef2bb8ef92 /arch/xtensa/kernel/vmlinux.lds.S | |
parent | 40b42f1ebf653cd72c32eb1a1a0b9fea2dfbfd7d (diff) | |
parent | b824325443bb010689d22262c6a4e0feb63bad56 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (33 commits)
xtensa: use DATA_DATA in xtensa
powerpc: add missing DATA_DATA to powerpc
cris: use DATA_DATA in cris
kallsyms: remove usage of memmem and _GNU_SOURCE from scripts/kallsyms.c
kbuild: use -fno-optimize-sibling-calls unconditionally
kconfig: reset generated values only if Kconfig and .config agree.
kbuild: fix the warning when running make tags
kconfig: strip 'CONFIG_' automatically in kernel configuration search
kbuild: use POSIX BRE in headers install target
Whitelist references from __dbe_table to .init
modpost white list pattern adjustment
kbuild: do section mismatch check on full vmlinux
kbuild: whitelist references from variables named _timer to .init.text
kbuild: remove hardcoded _logo names from modpost
kbuild: remove hardcoded apic_es7000 from modpost
kbuild: warn about references from .init.text to .exit.text
kbuild: consolidate section checks
kbuild: refactor code in modpost to improve maintainability
kbuild: ignore section mismatch warnings originating from .note section
kbuild: .paravirtprobe section is obsolete, so modpost doesn't need to handle it
...
Diffstat (limited to 'arch/xtensa/kernel/vmlinux.lds.S')
-rw-r--r-- | arch/xtensa/kernel/vmlinux.lds.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S index 3e31512109f9..ac4ed52034db 100644 --- a/arch/xtensa/kernel/vmlinux.lds.S +++ b/arch/xtensa/kernel/vmlinux.lds.S | |||
@@ -118,7 +118,8 @@ SECTIONS | |||
118 | _fdata = .; | 118 | _fdata = .; |
119 | .data : | 119 | .data : |
120 | { | 120 | { |
121 | *(.data) CONSTRUCTORS | 121 | DATA_DATA |
122 | CONSTRUCTORS | ||
122 | . = ALIGN(XCHAL_ICACHE_LINESIZE); | 123 | . = ALIGN(XCHAL_ICACHE_LINESIZE); |
123 | *(.data.cacheline_aligned) | 124 | *(.data.cacheline_aligned) |
124 | } | 125 | } |