Skip to contentSkip to conversation

FRV: Remove unused header asm/init.h.

PATCH New David Howells 1 participant 2 messages Apr 27, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 FRV: Remove unused header asm/init.h.

From: Tim Abbott <[email protected]>

It seems nothing has included the frv asm/init.h header for some time, and its actual contents are out of date with include/linux/init.h. So just delete it.

---

 arch/frv/include/asm/init.h |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)
 delete mode 100644 arch/frv/include/asm/init.h
arch/frv/include/asm/init.h deleted +0 -12
deleted file mode 100644
index 8b15838..0000000
@@ -1,12 +0,0 @@
-#ifndef _ASM_INIT_H
-#define _ASM_INIT_H
-
-#define __init __attribute__ ((__section__ (".text.init")))
-#define __initdata __attribute__ ((__section__ (".data.init")))
-/* For assembly routines */
-#define __INIT		.section	".text.init",#alloc,#execinstr
-#define __FINIT		.previous
-#define __INITDATA	.section	".data.init",#alloc,#write
-
-#endif
-
#1 lore raw

PATCH 2/2 FRV: Use __INIT macro instead of .text.init.

From: Tim Abbott <[email protected]>

FRV is placing some code in the .text.init section but does not reference that section in its linker scripts.

This change moves this code from the .text.init section to the .init.text section, which is presumably where it belongs.

---

 arch/frv/kernel/head-mmu-fr451.S |    3 ++-
 arch/frv/kernel/head-uc-fr401.S  |    3 ++-
 arch/frv/kernel/head-uc-fr451.S  |    3 ++-
 arch/frv/kernel/head-uc-fr555.S  |    3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)
arch/frv/kernel/head-mmu-fr451.S +2 -1
index c8f210d..98f87d5 100644
@@ -9,6 +9,7 @@
  * 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/ptrace.h>
@@ -31,7 +32,7 @@
 #define __400_LCR	0xfe000100
 #define __400_LSBR	0xfe000c00
 
-	.section	.text.init,"ax"
+	__INIT
 	.balign		4
 
 ###############################################################################
arch/frv/kernel/head-uc-fr401.S +2 -1
index ee282be..438643c 100644
@@ -9,6 +9,7 @@
  * 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/ptrace.h>
@@ -30,7 +31,7 @@
 #define __400_LCR	0xfe000100
 #define __400_LSBR	0xfe000c00
 
-	.section	.text.init,"ax"
+	__INIT
 	.balign		4
 
 ###############################################################################
arch/frv/kernel/head-uc-fr451.S +2 -1
index b10d9c8..b2a76c4 100644
@@ -9,6 +9,7 @@
  * 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/ptrace.h>
@@ -30,7 +31,7 @@
 #define __400_LCR	0xfe000100
 #define __400_LSBR	0xfe000c00
 
-	.section	.text.init,"ax"
+	__INIT
 	.balign		4
 
 ###############################################################################
arch/frv/kernel/head-uc-fr555.S +2 -1
index 39937c1..5497aaf 100644
@@ -9,6 +9,7 @@
  * 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/ptrace.h>
@@ -29,7 +30,7 @@
 #define __551_LCR	0xfeff1100
 #define __551_LSBR	0xfeff1c00
 
-	.section	.text.init,"ax"
+	__INIT
 	.balign		4
 
 ###############################################################################