leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes into sh/kbuild-fixes

Browse Source
This commit is contained in:
Paul Mundt 2009-07-20 23:29:26 +09:00
commit 6e1922bbd2
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mn10300/kernel/vmlinux.lds.S
View File

@ -107,7 +107,7 @@ SECTIONS
__init_end = .; __init_end = .;
/* freed after init ends here */ /* freed after init ends here */
BSS(4) BSS_SECTION(0, PAGE_SIZE, 4)
_end = . ; _end = . ;

19
include/asm-generic/vmlinux.lds.h
View File

@ -30,9 +30,7 @@
* EXCEPTION_TABLE(...) * EXCEPTION_TABLE(...)
* NOTES * NOTES
* *
* __bss_start = .; * BSS_SECTION(0, 0, 0)
* BSS_SECTION(0, 0)
* __bss_stop = .;
* _end = .; * _end = .;
* *
* /DISCARD/ : { * /DISCARD/ : {
@ -489,7 +487,8 @@
* bss (Block Started by Symbol) - uninitialized data * bss (Block Started by Symbol) - uninitialized data
* zeroed during startup * zeroed during startup
*/ */
#define SBSS \ #define SBSS(sbss_align) \
. = ALIGN(sbss_align); \
.sbss : AT(ADDR(.sbss) - LOAD_OFFSET) { \ .sbss : AT(ADDR(.sbss) - LOAD_OFFSET) { \
*(.sbss) \ *(.sbss) \
*(.scommon) \ *(.scommon) \
@ -498,12 +497,10 @@
#define BSS(bss_align) \ #define BSS(bss_align) \
. = ALIGN(bss_align); \ . = ALIGN(bss_align); \
.bss : AT(ADDR(.bss) - LOAD_OFFSET) { \ .bss : AT(ADDR(.bss) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__bss_start) = .; \
*(.bss.page_aligned) \ *(.bss.page_aligned) \
*(.dynbss) \ *(.dynbss) \
*(.bss) \ *(.bss) \
*(COMMON) \ *(COMMON) \
VMLINUX_SYMBOL(__bss_stop) = .; \
} }
/* /*
@ -735,8 +732,10 @@
INIT_RAM_FS \ INIT_RAM_FS \
} }
#define BSS_SECTION(sbss_align, bss_align) \ #define BSS_SECTION(sbss_align, bss_align, stop_align) \
SBSS \ . = ALIGN(sbss_align); \
VMLINUX_SYMBOL(__bss_start) = .; \
SBSS(sbss_align) \
BSS(bss_align) \ BSS(bss_align) \
. = ALIGN(4); . = ALIGN(stop_align); \
VMLINUX_SYMBOL(__bss_stop) = .;

2
scripts/kconfig/lxdialog/util.c
View File

@ -19,6 +19,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <stdarg.h>
#include "dialog.h" #include "dialog.h"
struct dialog_info dlg; struct dialog_info dlg;

2
scripts/kconfig/mconf.c
View File

@ -888,6 +888,8 @@ int main(int ac, char **av)
single_menu_mode = 1; single_menu_mode = 1;
} }
initscr();
getyx(stdscr, saved_y, saved_x); getyx(stdscr, saved_y, saved_x);
if (init_dialog(NULL)) { if (init_dialog(NULL)) {
fprintf(stderr, N_("Your display is too small to run Menuconfig!\n")); fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));

2
scripts/package/builddeb
View File

@ -89,7 +89,7 @@ for script in postinst postrm preinst prerm ; do
set -e set -e
# Pass maintainer script parameters to hook scripts # Pass maintainer script parameters to hook scripts
export DEB_MAINT_PARAMS="\$@" export DEB_MAINT_PARAMS="\$*"
test -d $debhookdir/$script.d && run-parts --arg="$version" $debhookdir/$script.d test -d $debhookdir/$script.d && run-parts --arg="$version" $debhookdir/$script.d
exit 0 exit 0