Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aea1f796 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 457f82ba 04e448d9

arch/mn10300/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ SECTIONS 
  __init_end = .;

  /* freed after init ends here */



  BSS(4)

  BSS_SECTION(0, PAGE_SIZE, 4)



  _end = . ;

include/asm-generic/vmlinux.lds.h

+9 −10
Original line number Diff line number Diff line
@@ -30,9 +30,7 @@ 
 *	EXCEPTION_TABLE(...)

 *	NOTES

 *

 *	__bss_start = .;

 *	BSS_SECTION(0, 0)

 *	__bss_stop = .;

 *	BSS_SECTION(0, 0, 0)

 *	_end = .;

 *

 *	/DISCARD/ : {
@@ -489,7 +487,8 @@ 
 * bss (Block Started by Symbol) - uninitialized data

 * zeroed during startup

 */

#define SBSS								\

#define SBSS(sbss_align)						\

	. = ALIGN(sbss_align);						\

	.sbss : AT(ADDR(.sbss) - LOAD_OFFSET) {				\

		*(.sbss)						\

		*(.scommon)						\
@@ -498,12 +497,10 @@ 
#define BSS(bss_align)							\

	. = ALIGN(bss_align);						\

	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {				\

		VMLINUX_SYMBOL(__bss_start) = .;			\

		*(.bss.page_aligned)					\

		*(.dynbss)						\

		*(.bss)							\

		*(COMMON)						\

		VMLINUX_SYMBOL(__bss_stop) = .;				\

	}



/*
@@ -735,8 +732,10 @@ 
		INIT_RAM_FS						\

	}



#define BSS_SECTION(sbss_align, bss_align)				\

	SBSS								\

#define BSS_SECTION(sbss_align, bss_align, stop_align)			\

	. = ALIGN(sbss_align);						\

	VMLINUX_SYMBOL(__bss_start) = .;				\

	SBSS(sbss_align)						\

	BSS(bss_align)							\

	. = ALIGN(4);

	. = ALIGN(stop_align);						\

	VMLINUX_SYMBOL(__bss_stop) = .;

scripts/kconfig/lxdialog/util.c

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */



#include <stdarg.h>



#include "dialog.h"



struct dialog_info dlg;

scripts/kconfig/mconf.c

+2 −0
Original line number Diff line number Diff line
@@ -888,6 +888,8 @@ int main(int ac, char **av) 
			single_menu_mode = 1;

	}



	initscr();



	getyx(stdscr, saved_y, saved_x);

	if (init_dialog(NULL)) {

		fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));

scripts/package/builddeb

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ for script in postinst postrm preinst prerm ; do 
set -e



# 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

exit 0