diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 16:19:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 16:19:17 -0500 |
| commit | 038c068f63a950c3a6ccfa814831ccac0ad48fb1 (patch) | |
| tree | 29389a8d23dd5e29012ac289920df27ade357857 /arch/arm/kernel/vmlinux.lds.S | |
| parent | 5992fd1995a5e69710011fc7d7945c62bf5b551b (diff) | |
| parent | e41698894d3fe64f17fe411e3e5ef3c2537bf2e6 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] CLPS7500 doesn't have IO ports
[ARM] Fix more apm-emulation.h
[ARM] 4234/1: Introduce get_irqnr_preamble and arch_ret_to_user for ns9xxx.
[ARM] 4233/1: nand/s3c2410.c: warning fix
[ARM] 4226/1: initial .data and .bss mappings of XIP kernel should be TEXT_OFFSET
[ARM] 4224/2: allow XIP kernel to boot again
[ARM] 4232/1: AT91: Generic GPIO bug
[ARM] 4231/1: AT91: Merge and typo fixes.
[ARM] 4229/1: S3C2410: Add MACH_QT2410 to s3c2410_defconfig
[ARM] 4228/2: S3C24XX: update s3c2410_defconfig for 2.6.21-rc1
Diffstat (limited to 'arch/arm/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index b929a60f7547..ddbdad48f5b2 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S | |||
| @@ -156,6 +156,7 @@ SECTIONS | |||
| 156 | 156 | ||
| 157 | _edata = .; | 157 | _edata = .; |
| 158 | } | 158 | } |
| 159 | _edata_loc = __data_loc + SIZEOF(.data); | ||
| 159 | 160 | ||
| 160 | .bss : { | 161 | .bss : { |
| 161 | __bss_start = .; /* BSS */ | 162 | __bss_start = .; /* BSS */ |