sh: Sync up the _64 linker script with the _32 version.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

arch/sh/kernel/vmlinux_64.lds.S

 /*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh5/vmlinux.lds.S
- *
- * ld script to make ST50 Linux kernel
+ * ld script to make SH64 Linux kernel
  *
  * Copyright (C) 2000, 2001  Paolo Alberelli
  *
@@ -13,15 +7,19 @@
  *    Add definition of empty_zero_page to be the first page of kernel image.
  *
  * benedict.gaster@superh.com:	 3rd May 2002
- *    Added support for ramdisk, removing statically linked romfs at the same time.
+ *    Added support for ramdisk, removing statically linked romfs at the
+ *    same time.
  *
  * lethal@linux-sh.org:          9th May 2003
  *    Kill off GLOBAL_NAME() usage and other CDC-isms.
  *
  * lethal@linux-sh.org:         19th May 2003
  *    Remove support for ancient toolchains.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
  */
-
 #include <asm/page.h>
 #include <asm/cache.h>
 #include <asm/thread_info.h>
@@ -38,7 +36,6 @@ SECTIONS
 {
 	. = CONFIG_CACHED_MEMORY_OFFSET + CONFIG_MEMORY_START + PAGE_SIZE;
 	_text = .;			/* Text and read-only data */
-  text = .;			/* Text and read-only data */
 
 	.empty_zero_page : C_PHYS(.empty_zero_page) {
 		*(.empty_zero_page)
@@ -51,6 +48,7 @@ SECTIONS
 		*(.text..SHmedia32)
 		SCHED_TEXT
 		LOCK_TEXT
+		KPROBES_TEXT
 		*(.fixup)
 		*(.gnu.warning)
 #ifdef CONFIG_LITTLE_ENDIAN
@@ -67,28 +65,34 @@ SECTIONS
 
 	_etext = .;			/* End of text section */
 
+	BUG_TABLE
 	NOTES 
+	RO_DATA(PAGE_SIZE)
 
-  RODATA
-
+	. = ALIGN(THREAD_SIZE);
 	.data : C_PHYS(.data) {			/* Data */
-	DATA_DATA
-	CONSTRUCTORS
-	}
+		*(.data.init_task)
+
+		. = ALIGN(L1_CACHE_BYTES);
+		*(.data.cacheline_aligned)
+
+		. = ALIGN(L1_CACHE_BYTES);
+		*(.data.read_mostly)
 
 		. = ALIGN(PAGE_SIZE);
-  .data.page_aligned : C_PHYS(.data.page_aligned) { *(.data.page_aligned) }
+		*(.data.page_aligned)
 
-  PERCPU(PAGE_SIZE)
+		__nosave_begin = .;
+		*(.data.nosave)
+		. = ALIGN(PAGE_SIZE);
+		__nosave_end = .;
 
-  . = ALIGN(L1_CACHE_BYTES);
-  .data.cacheline_aligned : C_PHYS(.data.cacheline_aligned) { *(.data.cacheline_aligned) }
+		DATA_DATA
+		CONSTRUCTORS
+	}
 
 	_edata = .;			/* End of data section */
 
-  . = ALIGN(THREAD_SIZE);	/* init_task: structure size aligned */
-  .data.init_task : C_PHYS(.data.init_task) { *(.data.init_task) }
-
 	. = ALIGN(PAGE_SIZE);		/* Init code and data */
 	__init_begin = .;
 	_sinittext = .;
@@ -105,32 +109,53 @@ SECTIONS
 	}
 	__initcall_end = .;
 	__con_initcall_start = .;
-  .con_initcall.init : C_PHYS(.con_initcall.init) { *(.con_initcall.init) }
+	.con_initcall.init : C_PHYS(.con_initcall.init) {
+		*(.con_initcall.init)
+	}
 	__con_initcall_end = .;
+
 	SECURITY_INIT
 
 #ifdef CONFIG_BLK_DEV_INITRD
+	. = ALIGN(PAGE_SIZE);
 	__initramfs_start = .;
 	.init.ramfs : C_PHYS(.init.ramfs) { *(.init.ramfs) }
 	__initramfs_end = .;
 #endif
 
+	. = ALIGN(8);
+	__machvec_start = .;
+	.machvec.init : C_PHYS(.machvec.init) { *(.machvec.init) }
+	__machvec_end = .;
+
+	PERCPU(PAGE_SIZE)
+
+	/*
+	 * .exit.text is discarded at runtime, not link time, to deal with
+	 * references from __bug_table
+	 */
+	.exit.text : C_PHYS(.exit.text) { *(.exit.text) }
+	.exit.data : C_PHYS(.exit.data) { *(.exit.data) }
+
 	. = ALIGN(PAGE_SIZE);
+	.bss : C_PHYS(.bss) {
 		__init_end = .;
-
-  /* Align to the biggest single data representation, head and tail */
-  . = ALIGN(8);
 		__bss_start = .;		/* BSS */
-  .bss : C_PHYS(.bss) {
+		*(.bss.page_aligned)
 		*(.bss)
-	}
-  . = ALIGN(8);
+		*(COMMON)
+		. = ALIGN(4);
+		_ebss = .;			/* uClinux MTD sucks */
 		_end = . ;
+	}
 
-  /* Sections to be discarded */
+	/*
+	 * 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.text)
-	*(.exit.data)
 		*(.exitcall.exit)
 	}