History

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 committed 17 years ago

Commit 29f31772 parents 59107c6 11294239 files · +27 −12Browse files

Unified · Split

9 files
  1. .gitignore +1 −0
  2. Makefile +3 −4
  3. arch/mn10300/kernel/vmlinux.lds.S +1 −1
  4. drivers/scsi/cxgb3i/Kbuild +1 −1
  5. include/asm-generic/vmlinux.lds.h +6 −6
  6. include/linux/init_task.h +3 −0
  7. include/linux/linkage.h +9 −0
  8. scripts/.gitignore +1 −0
  9. scripts/package/builddeb +2 −0
.gitignore+1−0
@@ -27,6 +27,7 @@ · 26 unmodified lines
27*.gz27*.gz
28*.lzma28*.lzma
29*.patch29*.patch
30*.gcno
30 31
31#32#
32# Top-level generic files33# Top-level generic files
Makefile+3−4
@@ -140,15 +140,13 @@ _all: modules · 139 unmodified lines
140endif140endif
141 141
142srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))142srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))
143TOPDIR := $(srctree)
144# FIXME - TOPDIR is obsolete, use srctree/objtree
145objtree := $(CURDIR)143objtree := $(CURDIR)
146src := $(srctree)144src := $(srctree)
147obj := $(objtree)145obj := $(objtree)
148 146
149VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))147VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))
150 148
151export srctree objtree VPATH TOPDIR149export srctree objtree VPATH
152 150
153 151
154# SUBARCH tells the usermode build what the underlying arch is. That is set152# SUBARCH tells the usermode build what the underlying arch is. That is set
@@ -344,7 +342,8 @@ KBUILD_CPPFLAGS := -D__KERNEL__ · 189 unmodified lines
344 342
345KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \343KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
346 -fno-strict-aliasing -fno-common \344 -fno-strict-aliasing -fno-common \
347 -Werror-implicit-function-declaration345 -Werror-implicit-function-declaration \
346 -Wno-format-security
348KBUILD_AFLAGS := -D__ASSEMBLY__347KBUILD_AFLAGS := -D__ASSEMBLY__
349 348
350# Read KERNELRELEASE from include/config/kernel.release (if it exists)349# Read KERNELRELEASE from include/config/kernel.release (if it exists)
arch/mn10300/kernel/vmlinux.lds.S+1−1
@@ -61,7 +61,7 @@ SECTIONS · 60 unmodified lines
61 _edata = .; /* End of data section */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 /* might get freed after init */66 /* might get freed after init */
67 . = ALIGN(PAGE_SIZE);67 . = ALIGN(PAGE_SIZE);
drivers/scsi/cxgb3i/Kbuild+1−1
@@ -1,4 +1,4 @@
1EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/cxgb31EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb3
2 2
3cxgb3i-y := cxgb3i_init.o cxgb3i_iscsi.o cxgb3i_pdu.o cxgb3i_offload.o cxgb3i_ddp.o3cxgb3i-y := cxgb3i_init.o cxgb3i_iscsi.o cxgb3i_pdu.o cxgb3i_offload.o cxgb3i_ddp.o
4obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o4obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o
include/asm-generic/vmlinux.lds.h+6−6
@@ -191,7 +191,7 @@ · 190 unmodified lines
191 . = ALIGN(align); \191 . = ALIGN(align); \
192 *(.data.cacheline_aligned)192 *(.data.cacheline_aligned)
193 193
194#define INIT_TASK(align) \194#define INIT_TASK_DATA(align) \
195 . = ALIGN(align); \195 . = ALIGN(align); \
196 *(.data.init_task)196 *(.data.init_task)
197 197
@@ -434,10 +434,10 @@ · 236 unmodified lines
434/*434/*
435 * Init task435 * Init task
436 */436 */
437#define INIT_TASK_DATA(align) \437#define INIT_TASK_DATA_SECTION(align) \
438 . = ALIGN(align); \438 . = ALIGN(align); \
439 .data.init_task : { \439 .data.init_task : { \
440 INIT_TASK \440 INIT_TASK_DATA(align) \
441 }441 }
442 442
443#ifdef CONFIG_CONSTRUCTORS443#ifdef CONFIG_CONSTRUCTORS
@@ -705,15 +705,15 @@ · 261 unmodified lines
705 * matches the requirment of PAGE_ALIGNED_DATA.705 * matches the requirment of PAGE_ALIGNED_DATA.
706 *706 *
707 * use 0 as page_align if page_aligned data is not used */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 . = ALIGN(PAGE_SIZE); \709 . = ALIGN(PAGE_SIZE); \
710 .data : AT(ADDR(.data) - LOAD_OFFSET) { \710 .data : AT(ADDR(.data) - LOAD_OFFSET) { \
711 INIT_TASK(inittask) \711 INIT_TASK_DATA(inittask) \
712 CACHELINE_ALIGNED_DATA(cacheline) \712 CACHELINE_ALIGNED_DATA(cacheline) \
713 READ_MOSTLY_DATA(cacheline) \713 READ_MOSTLY_DATA(cacheline) \
714 DATA_DATA \714 DATA_DATA \
715 CONSTRUCTORS \715 CONSTRUCTORS \
716 NOSAVE_DATA(nosave) \716 NOSAVE_DATA \
717 PAGE_ALIGNED_DATA(pagealigned) \717 PAGE_ALIGNED_DATA(pagealigned) \
718 }718 }
719 719
include/linux/init_task.h+3−0
@@ -183,5 +183,8 @@ extern struct cred init_cred; · 182 unmodified lines
183 LIST_HEAD_INIT(cpu_timers[2]), \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#endif190#endif
include/linux/linkage.h+9−0
@@ -21,6 +21,15 @@ · 20 unmodified lines
21#define __page_aligned_data __section(.data.page_aligned) __aligned(PAGE_SIZE)21#define __page_aligned_data __section(.data.page_aligned) __aligned(PAGE_SIZE)
22#define __page_aligned_bss __section(.bss.page_aligned) __aligned(PAGE_SIZE)22#define __page_aligned_bss __section(.bss.page_aligned) __aligned(PAGE_SIZE)
23 23
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
24/*33/*
25 * This is used by architectures to keep arguments on the stack34 * This is used by architectures to keep arguments on the stack
26 * untouched by the compiler by keeping them live until the end.35 * untouched by the compiler by keeping them live until the end.
scripts/.gitignore+1−0
@@ -7,3 +7,4 @@ pnmtologo · 6 unmodified lines
7bin2c7bin2c
8unifdef8unifdef
9binoffset9binoffset
10ihex2fw
scripts/package/builddeb+2−0
@@ -16,6 +16,8 @@ create_package() { · 15 unmodified lines
16 local pname="$1" pdir="$2"16 local pname="$1" pdir="$2"
17 17
18 cp debian/copyright "$pdir/usr/share/doc/$pname/"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 # Fix ownership and permissions22 # Fix ownership and permissions
21 chown -R root:root "$pdir"23 chown -R root:root "$pdir"