Revert "parisc: fix trivial section name warnings"

This reverts commit bd3bb8c15b9a80dbddfb7905b237a4a11a4725b4. Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>

Revert "parisc: fix trivial section name warnings"
This reverts commit bd3bb8c15b9a80dbddfb7905b237a4a11a4725b4. Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
Kyle McMartin
1 parent 5dd34572ad
Showing 11 changed files with 18 additions and 27 deletions Side-by-side Diff
arch/parisc/hpux/gate.S
arch/parisc/hpux/wrappers.S
arch/parisc/kernel/entry.S
arch/parisc/kernel/head.S
arch/parisc/kernel/hpmc.S
arch/parisc/kernel/pacache.S
arch/parisc/kernel/perf_asm.S
arch/parisc/kernel/real2.S
arch/parisc/kernel/syscall.S
arch/parisc/lib/fixup.S
arch/parisc/lib/lusercopy.S
@@ -13,10 +13,9 @@
 #include <asm/unistd.h>
 #include <asm/errno.h>
 #include <linux/linkage.h>
-#include <linux/init.h>
  
 	.level	LEVEL
-	__HEAD
+	.text
  
 	.import hpux_call_table
 	.import hpux_syscall_exit,code
@@ -28,10 +28,9 @@
 #include <asm/assembly.h>
 #include <asm/signal.h>
 #include <linux/linkage.h>
-#include <linux/init.h>
  
 	.level	LEVEL
-	__HEAD
+	.text
  
 	/* These should probably go in a header file somewhere.
 	 * They are duplicated in kernel/wrappers.S
@@ -38,7 +38,6 @@
 #include <asm/thread_info.h>
  
 #include <linux/linkage.h>
-#include <linux/init.h>
  
 #ifdef CONFIG_64BIT
 	.level 2.0w
@@ -622,7 +621,7 @@
 	 * the static part of the kernel address space.
 	 */
  
-	__HEAD
+	.text
  
 	.align	PAGE_SIZE
  
@@ -32,7 +32,7 @@
 	.word 0 /* arg3 */
 END(boot_args)
  
-	__HEAD
+	.section .text.head
 	.align	4
 	.import init_thread_union,data
 	.import fault_vector_20,code    /* IVA parisc 2.0 32 bit */
@@ -47,7 +47,6 @@
 #include <asm/pdc.h>
  
 #include <linux/linkage.h>
-#include <linux/init.h>
  
 	/*
 	 * stack for os_hpmc, the HPMC handler.
@@ -77,7 +76,7 @@
 	.block HPMC_PIM_DATA_SIZE
 END(hpmc_pim_data)
  
-	__HEAD
+	.text
  
 	.import intr_save, code
 ENTRY(os_hpmc)
@@ -37,9 +37,8 @@
 #include <asm/pgtable.h>
 #include <asm/cache.h>
 #include <linux/linkage.h>
-#include <linux/init.h>
  
-	__HEAD
+	.text
 	.align	128
  
 ENTRY(flush_tlb_all_local)
@@ -43,7 +43,7 @@
 ; The coprocessor only needs to be enabled when
 ; starting/stopping the coprocessor with the pmenb/pmdis.
 ;
-	__HEAD
+	.text
  
 ENTRY(perf_intrigue_enable_perf_counters)
 	.proc
@@ -12,7 +12,6 @@
 #include <asm/assembly.h>
  
 #include <linux/linkage.h>
-#include <linux/init.h>
  
 	.section	.bss
 	.export real_stack
@@ -40,7 +39,7 @@
 /************************ 32-bit real-mode calls ***********************/
 /* This can be called in both narrow and wide kernels */
  
-	__HEAD
+	.text
  
 	/* unsigned long real32_call_asm(unsigned int *sp,
 	 *		unsigned int *arg0p,
@@ -114,7 +113,7 @@
 #  define PUSH_CR(r, where) mfctl r, %r1 ! STREG,ma %r1, REG_SZ(where)
 #  define POP_CR(r, where) LDREG,mb -REG_SZ(where), %r1 ! mtctl %r1, r
  
-	__HEAD
+	.text
 save_control_regs:
 	load32	PA(save_cr_space), %r28
 	PUSH_CR(%cr24, %r28)
@@ -146,7 +145,7 @@
 /* rfi_virt2real() and rfi_real2virt() could perhaps be adapted for
  * more general-purpose use by the several places which need RFIs
  */
-	__HEAD
+	.text
 	.align 128
 rfi_virt2real:
 	/* switch to real mode... */
@@ -181,7 +180,7 @@
 	bv	0(%r2)
 	nop
  
-	__HEAD
+	.text
 	.align 128
 rfi_real2virt:
 	rsm		PSW_SM_I,%r0
@@ -219,7 +218,7 @@
  
 /************************ 64-bit real-mode calls ***********************/
 /* This is only usable in wide kernels right now and will probably stay so */
-	__HEAD
+	.text
 	/* unsigned long real64_call_asm(unsigned long *sp,
 	 *		unsigned long *arg0p,
 	 *		unsigned long fn)
@@ -277,7 +276,7 @@
  
 #endif
  
-	__HEAD
+	.text
 	/* http://lists.parisc-linux.org/hypermail/parisc-linux/10916.html
 	**	GCC 3.3 and later has a new function in libgcc.a for
 	**	comparing function pointers.
@@ -17,7 +17,6 @@
 #include <asm/processor.h>
  
 #include <linux/linkage.h>
-#include <linux/init.h>
  
 	/* We fill the empty parts of the gateway page with
  	 * something that will kill the kernel or a
@@ -27,7 +26,7 @@
  
 	.level          LEVEL
  
-	__HEAD
+	.text
  
 	.import syscall_exit,code
 	.import syscall_exit_rfi,code
@@ -637,7 +636,7 @@
 		All light-weight-syscall atomic operations 
 		will use this set of locks 
 	*/
-	.section .data, "aw"
+	.section .data
 	.align	PAGE_SIZE
 ENTRY(lws_lock_start)
 	/* lws locks */
@@ -23,7 +23,6 @@
 #include <asm/assembly.h>
 #include <asm/errno.h>
 #include <linux/linkage.h>
-#include <linux/init.h>
  
 #ifdef CONFIG_SMP
 	.macro  get_fault_ip t1 t2
@@ -56,7 +55,7 @@
  
 	.level LEVEL
  
-	__HEAD
+	.text
 	.section .fixup, "ax"
  
 	/* get_user() fixups, store -EFAULT in r8, and 0 in r9 */
@@ -33,12 +33,11 @@
  */
  
  
+	.text
+	
 #include <asm/assembly.h>
 #include <asm/errno.h>
 #include <linux/linkage.h>
-#include <linux/init.h>
-
-	__HEAD
  
 	/*
 	 * get_sr gets the appropriate space value into
...	...	@@ -13,10 +13,9 @@
13	13	#include <asm/unistd.h>
14	14	#include <asm/errno.h>
15	15	#include <linux/linkage.h>
16		-#include <linux/init.h>
17	16
18	17	.level LEVEL
19		- __HEAD
	18	+ .text
20	19
21	20	.import hpux_call_table
22	21	.import hpux_syscall_exit,code
...	...	@@ -28,10 +28,9 @@
28	28	#include <asm/assembly.h>
29	29	#include <asm/signal.h>
30	30	#include <linux/linkage.h>
31		-#include <linux/init.h>
32	31
33	32	.level LEVEL
34		- __HEAD
	33	+ .text
35	34
36	35	/* These should probably go in a header file somewhere.
37	36	* They are duplicated in kernel/wrappers.S
...	...	@@ -38,7 +38,6 @@
38	38	#include <asm/thread_info.h>
39	39
40	40	#include <linux/linkage.h>
41		-#include <linux/init.h>
42	41
43	42	#ifdef CONFIG_64BIT
44	43	.level 2.0w
...	...	@@ -622,7 +621,7 @@
622	621	* the static part of the kernel address space.
623	622	*/
624	623
625		- __HEAD
	624	+ .text
626	625
627	626	.align PAGE_SIZE
628	627
...	...	@@ -32,7 +32,7 @@
32	32	.word 0 /* arg3 */
33	33	END(boot_args)
34	34
35		- __HEAD
	35	+ .section .text.head
36	36	.align 4
37	37	.import init_thread_union,data
38	38	.import fault_vector_20,code /* IVA parisc 2.0 32 bit */
...	...	@@ -47,7 +47,6 @@
47	47	#include <asm/pdc.h>
48	48
49	49	#include <linux/linkage.h>
50		-#include <linux/init.h>
51	50
52	51	/*
53	52	* stack for os_hpmc, the HPMC handler.
...	...	@@ -77,7 +76,7 @@
77	76	.block HPMC_PIM_DATA_SIZE
78	77	END(hpmc_pim_data)
79	78
80		- __HEAD
	79	+ .text
81	80
82	81	.import intr_save, code
83	82	ENTRY(os_hpmc)
...	...	@@ -37,9 +37,8 @@
37	37	#include <asm/pgtable.h>
38	38	#include <asm/cache.h>
39	39	#include <linux/linkage.h>
40		-#include <linux/init.h>
41	40
42		- __HEAD
	41	+ .text
43	42	.align 128
44	43
45	44	ENTRY(flush_tlb_all_local)
...	...	@@ -43,7 +43,7 @@
43	43	; The coprocessor only needs to be enabled when
44	44	; starting/stopping the coprocessor with the pmenb/pmdis.
45	45	;
46		- __HEAD
	46	+ .text
47	47
48	48	ENTRY(perf_intrigue_enable_perf_counters)
49	49	.proc
...	...	@@ -12,7 +12,6 @@
12	12	#include <asm/assembly.h>
13	13
14	14	#include <linux/linkage.h>
15		-#include <linux/init.h>
16	15
17	16	.section .bss
18	17	.export real_stack
...	...	@@ -40,7 +39,7 @@
40	39	/********************** 32-bit real-mode calls *********************/
41	40	/* This can be called in both narrow and wide kernels */
42	41
43		- __HEAD
	42	+ .text
44	43
45	44	/* unsigned long real32_call_asm(unsigned int *sp,
46	45	* unsigned int *arg0p,
...	...	@@ -114,7 +113,7 @@
114	113	# define PUSH_CR(r, where) mfctl r, %r1 ! STREG,ma %r1, REG_SZ(where)
115	114	# define POP_CR(r, where) LDREG,mb -REG_SZ(where), %r1 ! mtctl %r1, r
116	115
117		- __HEAD
	116	+ .text
118	117	save_control_regs:
119	118	load32 PA(save_cr_space), %r28
120	119	PUSH_CR(%cr24, %r28)
...	...	@@ -146,7 +145,7 @@
146	145	/* rfi_virt2real() and rfi_real2virt() could perhaps be adapted for
147	146	* more general-purpose use by the several places which need RFIs
148	147	*/
149		- __HEAD
	148	+ .text
150	149	.align 128
151	150	rfi_virt2real:
152	151	/* switch to real mode... */
...	...	@@ -181,7 +180,7 @@
181	180	bv 0(%r2)
182	181	nop
183	182
184		- __HEAD
	183	+ .text
185	184	.align 128
186	185	rfi_real2virt:
187	186	rsm PSW_SM_I,%r0
...	...	@@ -219,7 +218,7 @@
219	218
220	219	/********************** 64-bit real-mode calls *********************/
221	220	/* This is only usable in wide kernels right now and will probably stay so */
222		- __HEAD
	221	+ .text
223	222	/* unsigned long real64_call_asm(unsigned long *sp,
224	223	* unsigned long *arg0p,
225	224	* unsigned long fn)
...	...	@@ -277,7 +276,7 @@
277	276
278	277	#endif
279	278
280		- __HEAD
	279	+ .text
281	280	/* http://lists.parisc-linux.org/hypermail/parisc-linux/10916.html
282	281	** GCC 3.3 and later has a new function in libgcc.a for
283	282	** comparing function pointers.
...	...	@@ -17,7 +17,6 @@
17	17	#include <asm/processor.h>
18	18
19	19	#include <linux/linkage.h>
20		-#include <linux/init.h>
21	20
22	21	/* We fill the empty parts of the gateway page with
23	22	* something that will kill the kernel or a
...	...	@@ -27,7 +26,7 @@
27	26
28	27	.level LEVEL
29	28
30		- __HEAD
	29	+ .text
31	30
32	31	.import syscall_exit,code
33	32	.import syscall_exit_rfi,code
...	...	@@ -637,7 +636,7 @@
637	636	All light-weight-syscall atomic operations
638	637	will use this set of locks
639	638	*/
640		- .section .data, "aw"
	639	+ .section .data
641	640	.align PAGE_SIZE
642	641	ENTRY(lws_lock_start)
643	642	/* lws locks */
...	...	@@ -23,7 +23,6 @@
23	23	#include <asm/assembly.h>
24	24	#include <asm/errno.h>
25	25	#include <linux/linkage.h>
26		-#include <linux/init.h>
27	26
28	27	#ifdef CONFIG_SMP
29	28	.macro get_fault_ip t1 t2
...	...	@@ -56,7 +55,7 @@
56	55
57	56	.level LEVEL
58	57
59		- __HEAD
	58	+ .text
60	59	.section .fixup, "ax"
61	60
62	61	/* get_user() fixups, store -EFAULT in r8, and 0 in r9 */