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

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:
kbuild: finally remove the obsolete variable $TOPDIR
gitignore: ignore scripts/ihex2fw
Kbuild: Disable the -Wformat-security gcc flag
gitignore: ignore gcov output files
kbuild: deb-pkg ship changelog
Add new __init_task_data macro to be used in arch init_task.c files.
asm-generic/vmlinux.lds.h: shuffle INIT_TASK* macro names in vmlinux.lds.h
Add new macros for page-aligned data and bss sections.
asm-generic/vmlinux.lds.h: Fix up RW_DATA_SECTION definition.

Linus Torvalds 29f31773 59107c65

+27 -12
unified split
+1
.gitignore
··· 27 27 *.gz 28 28 *.lzma 29 29 *.patch 30 + *.gcno 30 31 31 32 # 32 33 # Top-level generic files
+3 -4
Makefile
··· 140 140 endif 141 141 142 142 srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR)) 143 - TOPDIR := $(srctree) 144 - # FIXME - TOPDIR is obsolete, use srctree/objtree 145 143 objtree := $(CURDIR) 146 144 src := $(srctree) 147 145 obj := $(objtree) 148 146 149 147 VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD)) 150 148 151 - export srctree objtree VPATH TOPDIR 149 + export srctree objtree VPATH 152 150 153 151 154 152 # SUBARCH tells the usermode build what the underlying arch is. That is set ··· 342 344 343 345 KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ 344 346 -fno-strict-aliasing -fno-common \ 345 - -Werror-implicit-function-declaration 347 + -Werror-implicit-function-declaration \ 348 + -Wno-format-security 346 349 KBUILD_AFLAGS := -D__ASSEMBLY__ 347 350 348 351 # Read KERNELRELEASE from include/config/kernel.release (if it exists)
+1 -1
arch/mn10300/kernel/vmlinux.lds.S
··· 61 61 _edata = .; /* End of data section */ 62 62 } 63 63 64 - .data.init_task : { INIT_TASK(THREAD_SIZE); } 64 + .data.init_task : { INIT_TASK_DATA(THREAD_SIZE); } 65 65 66 66 /* might get freed after init */ 67 67 . = ALIGN(PAGE_SIZE);
+1 -1
drivers/scsi/cxgb3i/Kbuild
··· 1 - EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/cxgb3 1 + EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb3 2 2 3 3 cxgb3i-y := cxgb3i_init.o cxgb3i_iscsi.o cxgb3i_pdu.o cxgb3i_offload.o cxgb3i_ddp.o 4 4 obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o
+6 -6
include/asm-generic/vmlinux.lds.h
··· 191 191 . = ALIGN(align); \ 192 192 *(.data.cacheline_aligned) 193 193 194 - #define INIT_TASK(align) \ 194 + #define INIT_TASK_DATA(align) \ 195 195 . = ALIGN(align); \ 196 196 *(.data.init_task) 197 197 ··· 434 434 /* 435 435 * Init task 436 436 */ 437 - #define INIT_TASK_DATA(align) \ 437 + #define INIT_TASK_DATA_SECTION(align) \ 438 438 . = ALIGN(align); \ 439 439 .data.init_task : { \ 440 - INIT_TASK \ 440 + INIT_TASK_DATA(align) \ 441 441 } 442 442 443 443 #ifdef CONFIG_CONSTRUCTORS ··· 705 705 * matches the requirment of PAGE_ALIGNED_DATA. 706 706 * 707 707 * use 0 as page_align if page_aligned data is not used */ 708 - #define RW_DATA_SECTION(cacheline, nosave, pagealigned, inittask) \ 708 + #define RW_DATA_SECTION(cacheline, pagealigned, inittask) \ 709 709 . = ALIGN(PAGE_SIZE); \ 710 710 .data : AT(ADDR(.data) - LOAD_OFFSET) { \ 711 - INIT_TASK(inittask) \ 711 + INIT_TASK_DATA(inittask) \ 712 712 CACHELINE_ALIGNED_DATA(cacheline) \ 713 713 READ_MOSTLY_DATA(cacheline) \ 714 714 DATA_DATA \ 715 715 CONSTRUCTORS \ 716 - NOSAVE_DATA(nosave) \ 716 + NOSAVE_DATA \ 717 717 PAGE_ALIGNED_DATA(pagealigned) \ 718 718 } 719 719
+3
include/linux/init_task.h
··· 183 183 LIST_HEAD_INIT(cpu_timers[2]), \ 184 184 } 185 185 186 + /* Attach to the init_task data structure for proper alignment */ 187 + #define __init_task_data __attribute__((__section__(".data.init_task"))) 188 + 186 189 187 190 #endif
+9
include/linux/linkage.h
··· 22 22 #define __page_aligned_bss __section(.bss.page_aligned) __aligned(PAGE_SIZE) 23 23 24 24 /* 25 + * For assembly routines. 26 + * 27 + * Note when using these that you must specify the appropriate 28 + * alignment directives yourself 29 + */ 30 + #define __PAGE_ALIGNED_DATA .section ".data.page_aligned", "aw" 31 + #define __PAGE_ALIGNED_BSS .section ".bss.page_aligned", "aw" 32 + 33 + /* 25 34 * This is used by architectures to keep arguments on the stack 26 35 * untouched by the compiler by keeping them live until the end. 27 36 * The argument stack may be owned by the assembly-language
+1
scripts/.gitignore
··· 7 7 bin2c 8 8 unifdef 9 9 binoffset 10 + ihex2fw
+2
scripts/package/builddeb
··· 16 16 local pname="$1" pdir="$2" 17 17 18 18 cp debian/copyright "$pdir/usr/share/doc/$pname/" 19 + cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian" 20 + gzip -9 "$pdir/usr/share/doc/$pname/changelog.Debian" 19 21 20 22 # Fix ownership and permissions 21 23 chown -R root:root "$pdir"