---

yaml --- r: 144201 b: refs/heads/master c: 485c26e h: refs/heads/master i: 144199: 2057276 v: v3
git-mirror · Apr 24, 2009 · b930e0e · b930e0e
1 parent 61f049d
commit b930e0e
Show file tree

Hide file tree

Showing 57 changed files with 119 additions and 212 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51b3960e78575f96c989d08421596bb6ab569f44
+refs/heads/master: 485c26ec70f823f2a9cf45982b724893e53a859e
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
@@ -1620,8 +1620,6 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	nowb		[ARM]
 
-	nox2apic	[X86-64,APIC] Do not enable x2APIC mode.
-
 	nptcg=		[IA64] Override max number of concurrent global TLB
 			purges which is reported from either PAL_VM_SUMMARY or
 			SAL PALO.

diff --git a/trunk/arch/alpha/kernel/head.S b/trunk/arch/alpha/kernel/head.S
@@ -7,11 +7,10 @@
  * the kernel global pointer and jump to the kernel entry-point.
  */
 
-#include <linux/init.h>
 #include <asm/system.h>
 #include <asm/asm-offsets.h>
 
-__HEAD
+.section .text.head, "ax"
 .globl swapper_pg_dir
 .globl _stext
 swapper_pg_dir=SWAPPER_PGD

diff --git a/trunk/arch/alpha/kernel/vmlinux.lds.S b/trunk/arch/alpha/kernel/vmlinux.lds.S
@@ -16,7 +16,7 @@ SECTIONS
 
 	_text = .;	/* Text and read-only data */
 	.text : {
-		HEAD_TEXT
+	*(.text.head)
 		TEXT_TEXT
 		SCHED_TEXT
 		LOCK_TEXT

diff --git a/trunk/arch/frv/include/asm/bug.h b/trunk/arch/frv/include/asm/bug.h
@@ -30,7 +30,7 @@ extern void __debug_bug_printk(const char *file, unsigned line);
 do {						\
 	__debug_bug_trap(signr);		\
 	asm volatile("nop");			\
-} while(1)
+} while(0)
 
 #define HAVE_ARCH_BUG
 #define BUG()					\
@@ -46,8 +46,7 @@ do {						\
 #define HAVE_ARCH_KGDB_BAD_PAGE
 #define kgdb_bad_page(page) do { kgdb_raise(SIGABRT); } while(0)
 #endif
-
-#endif /* CONFIG_BUG */
+#endif
 
 #include <asm-generic/bug.h>
 

diff --git a/trunk/arch/frv/include/asm/unistd.h b/trunk/arch/frv/include/asm/unistd.h
@@ -339,12 +339,10 @@
 #define __NR_dup3		330
 #define __NR_pipe2		331
 #define __NR_inotify_init1	332
-#define __NR_preadv		333
-#define __NR_pwritev		334
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 335
+#define NR_syscalls 333
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 /* #define __ARCH_WANT_OLD_READDIR */

diff --git a/trunk/arch/frv/kernel/entry.S b/trunk/arch/frv/kernel/entry.S
@@ -1525,7 +1525,5 @@ sys_call_table:
 	.long sys_dup3			/* 330 */
 	.long sys_pipe2
 	.long sys_inotify_init1
-	.long sys_preadv
-	.long sys_pwritev
 
 syscall_table_size = (. - sys_call_table)
diff --git a/trunk/arch/frv/kernel/head.S b/trunk/arch/frv/kernel/head.S
@@ -9,7 +9,6 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#include <linux/init.h>
 #include <linux/threads.h>
 #include <linux/linkage.h>
 #include <asm/thread_info.h>
@@ -28,7 +27,7 @@
 #   command line string
 #
 ###############################################################################
-	__HEAD
+	.section	.text.head,"ax"
 	.balign		4
 
 	.globl		_boot, __head_reference

diff --git a/trunk/arch/frv/kernel/vmlinux.lds.S b/trunk/arch/frv/kernel/vmlinux.lds.S
@@ -26,7 +26,7 @@ SECTIONS
 
   _sinittext = .;
   .init.text : {
-	HEAD_TEXT
+	*(.text.head)
 #ifndef CONFIG_DEBUG_INFO
 	INIT_TEXT
 	EXIT_TEXT

diff --git a/trunk/arch/m32r/kernel/head.S b/trunk/arch/m32r/kernel/head.S
@@ -23,7 +23,7 @@ __INITDATA
 /*
  * References to members of the boot_cpu_data structure.
  */
-__HEAD
+.section .text.head, "ax"
 	.global	start_kernel
 	.global __bss_start
 	.global _end

diff --git a/trunk/arch/m32r/kernel/vmlinux.lds.S b/trunk/arch/m32r/kernel/vmlinux.lds.S
@@ -27,7 +27,7 @@ SECTIONS
   _text = .;			/* Text and read-only data */
   .boot : { *(.boot) } = 0
   .text : {
-	HEAD_TEXT
+	*(.text.head)
 	TEXT_TEXT
 	SCHED_TEXT
 	LOCK_TEXT

diff --git a/trunk/arch/m68k/kernel/head.S b/trunk/arch/m68k/kernel/head.S
@@ -577,7 +577,7 @@ func_define	putn,1
 #endif
 .endm
 
-__HEAD
+.section ".text.head","ax"
 ENTRY(_stext)
 /*
  * Version numbers of the bootinfo interface

diff --git a/trunk/arch/m68k/kernel/sun3-head.S b/trunk/arch/m68k/kernel/sun3-head.S
@@ -29,7 +29,7 @@ kernel_pmd_table:              .skip 0x2000
 .globl kernel_pg_dir
 .equ    kernel_pg_dir,kernel_pmd_table
 
-	__HEAD
+	.section .text.head
 ENTRY(_stext)
 ENTRY(_start)
 

diff --git a/trunk/arch/m68k/kernel/vmlinux-std.lds b/trunk/arch/m68k/kernel/vmlinux-std.lds
@@ -12,7 +12,7 @@ SECTIONS
   . = 0x1000;
   _text = .;			/* Text and read-only data */
   .text : {
-	HEAD_TEXT
+	*(.text.head)
 	TEXT_TEXT
 	SCHED_TEXT
 	LOCK_TEXT

diff --git a/trunk/arch/m68k/kernel/vmlinux-sun3.lds b/trunk/arch/m68k/kernel/vmlinux-sun3.lds
@@ -12,7 +12,7 @@ SECTIONS
   . = 0xE002000;
   _text = .;			/* Text and read-only data */
   .text : {
-	HEAD_TEXT
+	*(.text.head)
 	TEXT_TEXT
 	SCHED_TEXT
 	LOCK_TEXT

diff --git a/trunk/arch/mn10300/kernel/head.S b/trunk/arch/mn10300/kernel/head.S
@@ -9,7 +9,6 @@
  * 2 of the Licence, or (at your option) any later version.
  */
 
-#include <linux/init.h>
 #include <linux/threads.h>
 #include <linux/linkage.h>
 #include <linux/serial_reg.h>
@@ -20,7 +19,7 @@
 #include <asm/param.h>
 #include <unit/serial.h>
 
-	__HEAD
+	.section .text.head,"ax"
 
 ###############################################################################
 #

diff --git a/trunk/arch/mn10300/kernel/vmlinux.lds.S b/trunk/arch/mn10300/kernel/vmlinux.lds.S
@@ -27,7 +27,10 @@ SECTIONS
   _stext = .;
   _text = .;			/* Text and read-only data */
   .text : {
-	HEAD_TEXT
+	*(
+	.text.head
+	.text
+	)
 	TEXT_TEXT
 	SCHED_TEXT
 	LOCK_TEXT

diff --git a/trunk/arch/powerpc/kernel/head_32.S b/trunk/arch/powerpc/kernel/head_32.S
@@ -21,7 +21,6 @@
  *
  */
 
-#include <linux/init.h>
 #include <asm/reg.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
@@ -51,7 +50,7 @@
 	mtspr	SPRN_DBAT##n##L,RB;	\
 1:
 
-	__HEAD
+	.section	.text.head, "ax"
 	.stabs	"arch/powerpc/kernel/",N_SO,0,0,0f
 	.stabs	"head_32.S",N_SO,0,0,0f
 0:

diff --git a/trunk/arch/powerpc/kernel/head_40x.S b/trunk/arch/powerpc/kernel/head_40x.S
@@ -31,7 +31,6 @@
  *
  */
 
-#include <linux/init.h>
 #include <asm/processor.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
@@ -53,7 +52,7 @@
  *
  * This is all going to change RSN when we add bi_recs.......  -- Dan
  */
-	__HEAD
+	.section	.text.head, "ax"
 _ENTRY(_stext);
 _ENTRY(_start);
 

diff --git a/trunk/arch/powerpc/kernel/head_44x.S b/trunk/arch/powerpc/kernel/head_44x.S
@@ -28,7 +28,6 @@
  * option) any later version.
  */
 
-#include <linux/init.h>
 #include <asm/processor.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
@@ -51,7 +50,7 @@
  *   r7 - End of kernel command line string
  *
  */
-	__HEAD
+	.section	.text.head, "ax"
 _ENTRY(_stext);
 _ENTRY(_start);
 	/*

diff --git a/trunk/arch/powerpc/kernel/head_8xx.S b/trunk/arch/powerpc/kernel/head_8xx.S
@@ -19,7 +19,6 @@
  *
  */
 
-#include <linux/init.h>
 #include <asm/processor.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
@@ -39,7 +38,7 @@
 #else
 #define DO_8xx_CPU6(val, reg)
 #endif
-	__HEAD
+	.section	.text.head, "ax"
 _ENTRY(_stext);
 _ENTRY(_start);
 

diff --git a/trunk/arch/powerpc/kernel/head_fsl_booke.S b/trunk/arch/powerpc/kernel/head_fsl_booke.S
@@ -30,7 +30,6 @@
  * option) any later version.
  */
 
-#include <linux/init.h>
 #include <linux/threads.h>
 #include <asm/processor.h>
 #include <asm/page.h>
@@ -54,7 +53,7 @@
  *   r7 - End of kernel command line string
  *
  */
-	__HEAD
+	.section	.text.head, "ax"
 _ENTRY(_stext);
 _ENTRY(_start);
 	/*

diff --git a/trunk/arch/powerpc/kernel/vmlinux.lds.S b/trunk/arch/powerpc/kernel/vmlinux.lds.S
@@ -52,7 +52,7 @@ SECTIONS
 	/* Text and gots */
 	.text : AT(ADDR(.text) - LOAD_OFFSET) {
 		ALIGN_FUNCTION();
-		HEAD_TEXT
+		*(.text.head)
 		_text = .;
 		*(.text .fixup .text.init.refok .exit.text.refok __ftr_alt_*)
 		SCHED_TEXT

diff --git a/trunk/arch/s390/kernel/head.S b/trunk/arch/s390/kernel/head.S
@@ -23,7 +23,6 @@
  *
  */
 
-#include <linux/init.h>
 #include <asm/setup.h>
 #include <asm/lowcore.h>
 #include <asm/asm-offsets.h>
@@ -36,7 +35,7 @@
 #define ARCH_OFFSET	0
 #endif
 
-__HEAD
+.section ".text.head","ax"
 #ifndef CONFIG_IPL
 	.org   0
 	.long  0x00080000,0x80000000+startup	# Just a restart PSW

diff --git a/trunk/arch/s390/kernel/vmlinux.lds.S b/trunk/arch/s390/kernel/vmlinux.lds.S
@@ -29,8 +29,8 @@ SECTIONS
 	. = 0x00000000;
 	.text : {
 	_text = .;		/* Text and read-only data */
-		HEAD_TEXT
-		TEXT_TEXT
+		*(.text.head)
+	TEXT_TEXT
 		SCHED_TEXT
 		LOCK_TEXT
 		KPROBES_TEXT
-Original file line number
+Diff line change
@@ Expand Up / @@ -577,7 +577,7 @@ func_define putn,1 @@
     #endif
     .endm
-    __HEAD
+    .section ".text.head","ax"
     ENTRY(_stext)
     /*
      * Version numbers of the bootinfo interface
@@ Expand Down @@