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

This project is archived. Its data is read-only.

Commit 080e8927 authored May 21, 2007 by Linus Torvalds

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix:
  mm/slab: fix section mismatch warning
  mm: fix section mismatch warnings
  init/main: use __init_refok to fix section mismatch
  kbuild: introduce __init_refok/__initdata_refok to supress section mismatch warnings
  all-archs: consolidate .data section definition in asm-generic
  all-archs: consolidate .text section definition in asm-generic
  kbuild: add "Section mismatch" warning whitelist for powerpc
  kbuild: make better section mismatch reports on i386, arm and mips
  kbuild: make modpost section warnings clearer
  kconfig: search harder for curses library in check-lxdialog.sh
  kbuild: include limits.h in sumversion.c for PATH_MAX
  powerpc: Fix the MODALIAS generation in modpost for of devices

parents 4b85df04 38bdc32a

arch/alpha/kernel/vmlinux.lds.S

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@ SECTIONS

	_text = .; /* Text and read-only data */		_text = .; /* Text and read-only data */
	.text : {		.text : {
	*(.text)		TEXT_TEXT
	SCHED_TEXT		SCHED_TEXT
	LOCK_TEXT		LOCK_TEXT
	*(.fixup)		*(.fixup)
	@@ -89,7 +89,7 @@ SECTIONS

	_data = .;		_data = .;
	.data : { /* Data */		.data : { /* Data */
	*(.data)		DATA_DATA
	CONSTRUCTORS		CONSTRUCTORS
	}		}

arch/arm/kernel/vmlinux.lds.S

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -90,7 +90,7 @@ SECTIONS
	__exception_text_start = .;		__exception_text_start = .;
	*(.exception.text)		*(.exception.text)
	__exception_text_end = .;		__exception_text_end = .;
	*(.text)		TEXT_TEXT
	SCHED_TEXT		SCHED_TEXT
	LOCK_TEXT		LOCK_TEXT
	#ifdef CONFIG_MMU		#ifdef CONFIG_MMU
	@@ -158,7 +158,7 @@ SECTIONS
	/*		/*
	* and the usual data section		* and the usual data section
	*/		*/
	*(.data)		DATA_DATA
	CONSTRUCTORS		CONSTRUCTORS

	_edata = .;		_edata = .;

arch/arm26/kernel/vmlinux-arm26-xip.lds.in

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -64,7 +64,7 @@ SECTIONS

	.text : { /* Real text segment */		.text : { /* Real text segment */
	_text = .; /* Text and read-only data */		_text = .; /* Text and read-only data */
	*(.text)		TEXT_TEXT
	SCHED_TEXT		SCHED_TEXT
	LOCK_TEXT /* FIXME - borrowed from arm32 - check*/		LOCK_TEXT /* FIXME - borrowed from arm32 - check*/
	*(.fixup)		*(.fixup)
	@@ -111,7 +111,7 @@ SECTIONS
	/*		/*
	* and the usual data section		* and the usual data section
	*/		*/
	*(.data)		DATA_DATA
	CONSTRUCTORS		CONSTRUCTORS

	*(.init.data)		*(.init.data)

arch/arm26/kernel/vmlinux-arm26.lds.in

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -65,7 +65,7 @@ SECTIONS

	.text : { /* Real text segment */		.text : { /* Real text segment */
	_text = .; /* Text and read-only data */		_text = .; /* Text and read-only data */
	*(.text)		TEXT_TEXT
	SCHED_TEXT		SCHED_TEXT
	LOCK_TEXT		LOCK_TEXT
	*(.fixup)		*(.fixup)
	@@ -106,7 +106,7 @@ SECTIONS
	/*		/*
	* and the usual data section		* and the usual data section
	*/		*/
	*(.data)		DATA_DATA
	CONSTRUCTORS		CONSTRUCTORS

	_edata = .;		_edata = .;

arch/avr32/kernel/vmlinux.lds.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -76,7 +76,7 @@ SECTIONS
	. = 0x100;		. = 0x100;
	*(.scall.text)		*(.scall.text)
	*(.irq.text)		*(.irq.text)
	*(.text)		TEXT_TEXT
	SCHED_TEXT		SCHED_TEXT
	LOCK_TEXT		LOCK_TEXT
	KPROBES_TEXT		KPROBES_TEXT
	@@ -112,7 +112,7 @@ SECTIONS

	/* And the rest... */		/* And the rest... */
	(.data.rel)		(.data.rel)
	*(.data)		DATA_DATA
	CONSTRUCTORS		CONSTRUCTORS

	_edata = .;		_edata = .;