From f34ac6b037570db6d2fef669fab445520f6c9201 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 9 Apr 2010 00:14:35 -0700 Subject: [PATCH] --- yaml --- r: 189877 b: refs/heads/master c: 8b8d8e2840a440d62e8dc0ef36ba433b26f70d32 h: refs/heads/master i: 189875: ed7c694ddbd176dcf466099b8bff5be85bc26ebb v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/vmlinux.lds.S | 4 ++++ trunk/lib/Kconfig.debug | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 035387568aed..78bebf065b2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9960e9e8944f9b1ca6af5f7d26400ca45b429600 +refs/heads/master: 8b8d8e2840a440d62e8dc0ef36ba433b26f70d32 diff --git a/trunk/arch/sparc/kernel/vmlinux.lds.S b/trunk/arch/sparc/kernel/vmlinux.lds.S index c4f5758c9dc7..0c1e6783657f 100644 --- a/trunk/arch/sparc/kernel/vmlinux.lds.S +++ b/trunk/arch/sparc/kernel/vmlinux.lds.S @@ -52,6 +52,10 @@ SECTIONS _etext = .; RO_DATA(PAGE_SIZE) + + /* Start of data section */ + _sdata = .; + .data1 : { *(.data1) } diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug index 1fafb4b99c9b..6c2be6089559 100644 --- a/trunk/lib/Kconfig.debug +++ b/trunk/lib/Kconfig.debug @@ -356,7 +356,7 @@ config SLUB_STATS config DEBUG_KMEMLEAK bool "Kernel memory leak detector" depends on DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && \ - (X86 || ARM || PPC || S390 || SUPERH) + (X86 || ARM || PPC || S390 || SPARC64 || SUPERH) select DEBUG_FS if SYSFS select STACKTRACE if STACKTRACE_SUPPORT