diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-29 06:46:14 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-29 06:46:14 -0500 |
| commit | 5ea293a9048d3a58cb0c840fa719d85ad14cba47 (patch) | |
| tree | 88d1dd1eece2cfcbd858ff2c00fb0240dcfab3c7 /arch/v850/kernel/vmlinux.lds.S | |
| parent | 03bc26cfefd6db756e6bc7fcda11dc17ada7be16 (diff) | |
| parent | d3883ecebbf9e095b9e379dabbbe8b2c1ee7a41c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (79 commits)
Remove references to "make dep"
kconfig: document use of HAVE_*
Introduce new section reference annotations tags: __ref, __refdata, __refconst
kbuild: warn about ld added unique sections
kbuild: add verbose option to Section mismatch reporting in modpost
kconfig: tristate choices with mixed tristate and boolean values
asm-generic/vmlix.lds.h: simplify __mem{init,exit}* dependencies
remove __attribute_used__
kbuild: support ARCH=x86 in buildtar
kconfig: remove "enable"
kbuild: simplified warning report in modpost
kbuild: introduce a few helpers in modpost
kbuild: use simpler section mismatch warnings in modpost
kbuild: link vmlinux.o before kallsyms passes
kbuild: introduce new option to enhance section mismatch analysis
Use separate sections for __dev/__cpu/__mem code/data
compiler.h: introduce __section()
all archs: consolidate init and exit sections in vmlinux.lds.h
kbuild: check section names consistently in modpost
kbuild: introduce blacklisting in modpost
...
Diffstat (limited to 'arch/v850/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/v850/kernel/vmlinux.lds.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/v850/kernel/vmlinux.lds.S b/arch/v850/kernel/vmlinux.lds.S index 6172599b4ce2..d08cd1d27f27 100644 --- a/arch/v850/kernel/vmlinux.lds.S +++ b/arch/v850/kernel/vmlinux.lds.S | |||
| @@ -114,7 +114,7 @@ | |||
| 114 | #define DATA_CONTENTS \ | 114 | #define DATA_CONTENTS \ |
| 115 | __sdata = . ; \ | 115 | __sdata = . ; \ |
| 116 | DATA_DATA \ | 116 | DATA_DATA \ |
| 117 | *(.exit.data) /* 2.5 convention */ \ | 117 | EXIT_DATA /* 2.5 convention */ \ |
| 118 | *(.data.exit) /* 2.4 convention */ \ | 118 | *(.data.exit) /* 2.4 convention */ \ |
| 119 | . = ALIGN (16) ; \ | 119 | . = ALIGN (16) ; \ |
| 120 | *(.data.cacheline_aligned) \ | 120 | *(.data.cacheline_aligned) \ |
| @@ -157,9 +157,9 @@ | |||
| 157 | . = ALIGN (4096) ; \ | 157 | . = ALIGN (4096) ; \ |
| 158 | __init_start = . ; \ | 158 | __init_start = . ; \ |
| 159 | __sinittext = .; \ | 159 | __sinittext = .; \ |
| 160 | *(.init.text) /* 2.5 convention */ \ | 160 | INIT_TEXT /* 2.5 convention */ \ |
| 161 | __einittext = .; \ | 161 | __einittext = .; \ |
| 162 | *(.init.data) \ | 162 | INIT_DATA \ |
| 163 | *(.text.init) /* 2.4 convention */ \ | 163 | *(.text.init) /* 2.4 convention */ \ |
| 164 | *(.data.init) \ | 164 | *(.data.init) \ |
| 165 | INITCALL_CONTENTS \ | 165 | INITCALL_CONTENTS \ |
| @@ -170,7 +170,7 @@ | |||
| 170 | #define ROMK_INIT_RAM_CONTENTS \ | 170 | #define ROMK_INIT_RAM_CONTENTS \ |
| 171 | . = ALIGN (4096) ; \ | 171 | . = ALIGN (4096) ; \ |
| 172 | __init_start = . ; \ | 172 | __init_start = . ; \ |
| 173 | *(.init.data) /* 2.5 convention */ \ | 173 | INIT_DATA /* 2.5 convention */ \ |
| 174 | *(.data.init) /* 2.4 convention */ \ | 174 | *(.data.init) /* 2.4 convention */ \ |
| 175 | __init_end = . ; \ | 175 | __init_end = . ; \ |
| 176 | . = ALIGN (4096) ; | 176 | . = ALIGN (4096) ; |
| @@ -179,7 +179,7 @@ | |||
| 179 | should go into ROM. */ | 179 | should go into ROM. */ |
| 180 | #define ROMK_INIT_ROM_CONTENTS \ | 180 | #define ROMK_INIT_ROM_CONTENTS \ |
| 181 | _sinittext = .; \ | 181 | _sinittext = .; \ |
| 182 | *(.init.text) /* 2.5 convention */ \ | 182 | INIT_TEXT /* 2.5 convention */ \ |
| 183 | _einittext = .; \ | 183 | _einittext = .; \ |
| 184 | *(.text.init) /* 2.4 convention */ \ | 184 | *(.text.init) /* 2.4 convention */ \ |
| 185 | INITCALL_CONTENTS \ | 185 | INITCALL_CONTENTS \ |