diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-02 14:19:52 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-02 14:19:52 +1000 |
| commit | 68e10e57e504c60e16cd4cb4f1d8aae1538eb600 (patch) | |
| tree | 106c9f22f7eb475734c96871fdcf3772c4caa05d /arch/arm/kernel | |
| parent | 0b8dd04b52677ea56191e459640d128d07533323 (diff) | |
| parent | 14b0fa53008af894028abdcb6b8a8b5d07c3d42a (diff) | |
Merge commit 'kmemleak/kmemleak'
Conflicts:
arch/x86/kernel/vmlinux_32.lds.S
arch/x86/kernel/vmlinux_64.lds.S
lib/Kconfig.debug
mm/slob.c
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/vmlinux.lds.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index c90f27250ead..6c0779792546 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -141,6 +141,7 @@ SECTIONS .data : AT(__data_loc) { _data = .; /* address in memory */ + _sdata = .; /* * first, the init task union, aligned @@ -192,6 +193,7 @@ SECTIONS __bss_start = .; /* BSS */ *(.bss) *(COMMON) + __bss_stop = .; _end = .; } /* Stabs debugging sections. */ |