aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-20 16:49:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-20 16:49:45 -0700
commitaea1f7964ae6cba5eb419a958956deb9016b3341 (patch)
treee326d376529ea0be73ab435317709b684bb3f7cf /arch
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs (diff)
parentvmlinux.lds.h: restructure BSS linker script macros (diff)
downloadlinux-dev-aea1f7964ae6cba5eb419a958956deb9016b3341.tar.xz
linux-dev-aea1f7964ae6cba5eb419a958956deb9016b3341.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes: vmlinux.lds.h: restructure BSS linker script macros kconfig: initialize the screen before using curses(3) functions kconfig: variable argument lists needs `stdarg.h' kbuild, deb-pkg: fix install scripts for posix sh
Diffstat (limited to 'arch')
-rw-r--r--arch/mn10300/kernel/vmlinux.lds.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S
index c96ba3da95ac..f4aa07934654 100644
--- a/arch/mn10300/kernel/vmlinux.lds.S
+++ b/arch/mn10300/kernel/vmlinux.lds.S
@@ -107,7 +107,7 @@ SECTIONS
__init_end = .;
/* freed after init ends here */
- BSS(4)
+ BSS_SECTION(0, PAGE_SIZE, 4)
_end = . ;