From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 16 Sep 2009 04:48:32 +0000 (+0900)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.32-rc1~640^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea88023b3491a384575ebcd5e8a449e841a28a24;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/sh/kernel/vmlinux.lds.S
---

ea88023b3491a384575ebcd5e8a449e841a28a24
diff --cc arch/sh/kernel/vmlinux.lds.S
index 1b7d9d5,0ce254b..a1e4ec2
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@@ -94,21 -152,25 +94,13 @@@ SECTION
  	.exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { EXIT_DATA }
  
  	. = ALIGN(PAGE_SIZE);
 -	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {
 -		__init_end = .;
 -		__bss_start = .;		/* BSS */
 -		*(.bss.page_aligned)
 -		*(.bss)
 -		*(COMMON)
 -		. = ALIGN(4);
 -		_ebss = .;			/* uClinux MTD sucks */
 -		_end = . ;
 -	}
 +	__init_end = .;
 +	BSS_SECTION(0, PAGE_SIZE, 4)
 +	_ebss = .;			/* uClinux MTD sucks */
 +	_end = . ;
  
- 	/*
- 	 * When something in the kernel is NOT compiled as a module, the
- 	 * module cleanup code and data are put into these segments. Both
- 	 * can then be thrown away, as cleanup code is never called unless
- 	 * it's a module.
- 	 */
- 	/DISCARD/ : {
- 		EXIT_CALL
- 	}
- 
  	STABS_DEBUG
  	DWARF_DEBUG
+ 
 -	/*
 -	 * When something in the kernel is NOT compiled as a module, the
 -	 * module cleanup code and data are put into these segments. Both
 -	 * can then be thrown away, as cleanup code is never called unless
 -	 * it's a module.
 -	 */
+ 	DISCARDS
  }