Skip to contentSkip to conversation

m68knommu: Mark config_BSP() __init

PATCH In review Geert Uytterhoeven 2 participants 5 messages Jun 25, 2013 – Jun 30, 2013 m68k architecture

lore
Share & tools
lore

Geert Uytterhoeven

author maintainer
#0 lore raw

PATCH 1/1 m68knommu: Mark config_BSP() __init

Some instances of config_BSP() lack an __init annotation.

---
 arch/m68k/platform/68000/m68328.c   |    3 ++-
 arch/m68k/platform/68000/m68EZ328.c |    3 ++-
 arch/m68k/platform/68000/m68VZ328.c |    3 ++-
 arch/m68k/platform/68360/config.c   |    3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)
arch/m68k/platform/68000/m68328.c +2 -1
index a86eb66..e53caf4 100644
@@ -15,6 +15,7 @@
 
 /***************************************************************************/
 
+#include <linux/init.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/rtc.h>
@@ -42,7 +43,7 @@ void m68328_reset (void)
 
 /***************************************************************************/
 
-void config_BSP(char *command, int len)
+void __init config_BSP(char *command, int len)
 {
   printk(KERN_INFO "\n68328 support D. Jeff Dionne <[email protected]>\n");
   printk(KERN_INFO "68328 support Kenneth Albanowski <[email protected]>\n");
arch/m68k/platform/68000/m68EZ328.c +2 -1
index a6eb72d..332b5e8 100644
@@ -13,6 +13,7 @@
 
 /***************************************************************************/
 
+#include <linux/init.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/rtc.h>
@@ -52,7 +53,7 @@ _bsc1(unsigned char *, gethwaddr, int, a)
 _bsc1(char *, getbenv, char *, a)
 #endif
 
-void config_BSP(char *command, int len)
+void __init config_BSP(char *command, int len)
 {
   unsigned char *p;
 
arch/m68k/platform/68000/m68VZ328.c +2 -1
index eb6964f..42e1ada 100644
@@ -14,6 +14,7 @@
 
 /***************************************************************************/
 
+#include <linux/init.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/kd.h>
@@ -175,7 +176,7 @@ static void init_hardware(char *command, int size)
 #endif
 /***************************************************************************/
 
-void config_BSP(char *command, int size)
+void __init config_BSP(char *command, int size)
 {
 	printk(KERN_INFO "68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n");
 
arch/m68k/platform/68360/config.c +2 -1
index 9877cef..0570741 100644
@@ -11,6 +11,7 @@
  */
 
 #include <stdarg.h>
+#include <linux/init.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
@@ -140,7 +141,7 @@ _bsc1(char *, getbenv, char *, a)
 #endif
 
 
-void config_BSP(char *command, int len)
+void __init config_BSP(char *command, int len)
 {
   unsigned char *p;
 
Signature · 1 line
1.7.9.5
Acked-by on v1 1/1
#1 lore raw

Hi Geert,

Quoted 3 lines · Geert Uytterhoeven

Some instances of config_BSP() lack an __init annotation.

Looks good. Are you going to push it via your tree, or do you want me too?

Regards
Greg

Quoted 92 lines
---
  arch/m68k/platform/68000/m68328.c   |    3 ++-
  arch/m68k/platform/68000/m68EZ328.c |    3 ++-
  arch/m68k/platform/68000/m68VZ328.c |    3 ++-
  arch/m68k/platform/68360/config.c   |    3 ++-
  4 files changed, 8 insertions(+), 4 deletions(-)
arch/m68k/platform/68000/m68328.c +2 -1
index a86eb66..e53caf4 100644
@@ -15,6 +15,7 @@
 
  /***************************************************************************/
 
+#include <linux/init.h>
  #include <linux/types.h>
  #include <linux/kernel.h>
  #include <linux/rtc.h>
@@ -42,7 +43,7 @@ void m68328_reset (void)
 
  /***************************************************************************/
 
-void config_BSP(char *command, int len)
+void __init config_BSP(char *command, int len)
  {
    printk(KERN_INFO "\n68328 support D. Jeff Dionne <[email protected]>\n");
    printk(KERN_INFO "68328 support Kenneth Albanowski <[email protected]>\n");
arch/m68k/platform/68000/m68EZ328.c +2 -1
index a6eb72d..332b5e8 100644
@@ -13,6 +13,7 @@
 
  /***************************************************************************/
 
+#include <linux/init.h>
  #include <linux/types.h>
  #include <linux/kernel.h>
  #include <linux/rtc.h>
@@ -52,7 +53,7 @@ _bsc1(unsigned char *, gethwaddr, int, a)
  _bsc1(char *, getbenv, char *, a)
  #endif
 
-void config_BSP(char *command, int len)
+void __init config_BSP(char *command, int len)
  {
    unsigned char *p;
 
arch/m68k/platform/68000/m68VZ328.c +2 -1
index eb6964f..42e1ada 100644
@@ -14,6 +14,7 @@
 
  /***************************************************************************/
 
+#include <linux/init.h>
  #include <linux/types.h>
  #include <linux/kernel.h>
  #include <linux/kd.h>
@@ -175,7 +176,7 @@ static void init_hardware(char *command, int size)
  #endif
  /***************************************************************************/
 
-void config_BSP(char *command, int size)
+void __init config_BSP(char *command, int size)
  {
  	printk(KERN_INFO "68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n");
 
arch/m68k/platform/68360/config.c +2 -1
index 9877cef..0570741 100644
@@ -11,6 +11,7 @@
   */
 
  #include <stdarg.h>
+#include <linux/init.h>
  #include <linux/types.h>
  #include <linux/kernel.h>
  #include <linux/mm.h>
@@ -140,7 +141,7 @@ _bsc1(char *, getbenv, char *, a)
  #endif
 
 
-void config_BSP(char *command, int len)
+void __init config_BSP(char *command, int len)
  {
    unsigned char *p;
 
author maintainer
#2 lore raw
Quoted 11 lines · Greg Ungerer
Quoted 4 lines · Geert Uytterhoeven

Some instances of config_BSP() lack an __init annotation.

Looks good. Are you going to push it via your tree, or do you want me too?

As it's m68nommu, perhaps through your tree? Unless you don't have time to handle it.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

author maintainer
#3 lore raw
In reply to Greg Ungerer
Quoted 11 lines · Greg Ungerer
Quoted 4 lines · Geert Uytterhoeven

Some instances of config_BSP() lack an __init annotation.

Looks good. Are you going to push it via your tree, or do you want me too?

As it's m68nommu, perhaps through your tree? Unless you don't have time to handle it.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#4 lore raw

Hi Geert,

Quoted 8 lines · Geert Uytterhoeven
Quoted 7 lines · Greg Ungerer
Quoted 4 lines · Geert Uytterhoeven

Some instances of config_BSP() lack an __init annotation.

Quoted 7 lines
Quoted 4 lines

Looks good. Are you going to push it via your tree, or do you want me too?

As it's m68nommu, perhaps through your tree? Unless you don't have time to handle it.

I can take care of it. Though I may be a little slower than usual, I am traveling at the moment.

Regards
Greg