tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds aea1f796 457f82ba

+15 -12
+1 -1
arch/mn10300/kernel/vmlinux.lds.S
··· 107 107 __init_end = .; 108 108 /* freed after init ends here */ 109 109 110 - BSS(4) 110 + BSS_SECTION(0, PAGE_SIZE, 4) 111 111 112 112 _end = . ; 113 113
+9 -10
include/asm-generic/vmlinux.lds.h
··· 30 30 * EXCEPTION_TABLE(...) 31 31 * NOTES 32 32 * 33 - * __bss_start = .; 34 - * BSS_SECTION(0, 0) 35 - * __bss_stop = .; 33 + * BSS_SECTION(0, 0, 0) 36 34 * _end = .; 37 35 * 38 36 * /DISCARD/ : { ··· 487 489 * bss (Block Started by Symbol) - uninitialized data 488 490 * zeroed during startup 489 491 */ 490 - #define SBSS \ 492 + #define SBSS(sbss_align) \ 493 + . = ALIGN(sbss_align); \ 491 494 .sbss : AT(ADDR(.sbss) - LOAD_OFFSET) { \ 492 495 *(.sbss) \ 493 496 *(.scommon) \ ··· 497 498 #define BSS(bss_align) \ 498 499 . = ALIGN(bss_align); \ 499 500 .bss : AT(ADDR(.bss) - LOAD_OFFSET) { \ 500 - VMLINUX_SYMBOL(__bss_start) = .; \ 501 501 *(.bss.page_aligned) \ 502 502 *(.dynbss) \ 503 503 *(.bss) \ 504 504 *(COMMON) \ 505 - VMLINUX_SYMBOL(__bss_stop) = .; \ 506 505 } 507 506 508 507 /* ··· 732 735 INIT_RAM_FS \ 733 736 } 734 737 735 - #define BSS_SECTION(sbss_align, bss_align) \ 736 - SBSS \ 738 + #define BSS_SECTION(sbss_align, bss_align, stop_align) \ 739 + . = ALIGN(sbss_align); \ 740 + VMLINUX_SYMBOL(__bss_start) = .; \ 741 + SBSS(sbss_align) \ 737 742 BSS(bss_align) \ 738 - . = ALIGN(4); 739 - 743 + . = ALIGN(stop_align); \ 744 + VMLINUX_SYMBOL(__bss_stop) = .;
+2
scripts/kconfig/lxdialog/util.c
··· 19 19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 20 */ 21 21 22 + #include <stdarg.h> 23 + 22 24 #include "dialog.h" 23 25 24 26 struct dialog_info dlg;
+2
scripts/kconfig/mconf.c
··· 888 888 single_menu_mode = 1; 889 889 } 890 890 891 + initscr(); 892 + 891 893 getyx(stdscr, saved_y, saved_x); 892 894 if (init_dialog(NULL)) { 893 895 fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));
+1 -1
scripts/package/builddeb
··· 89 89 set -e 90 90 91 91 # Pass maintainer script parameters to hook scripts 92 - export DEB_MAINT_PARAMS="\$@" 92 + export DEB_MAINT_PARAMS="\$*" 93 93 94 94 test -d $debhookdir/$script.d && run-parts --arg="$version" $debhookdir/$script.d 95 95 exit 0