Some instances of config_BSP() lack an __init annotation.
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
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(-)
diff --git a/arch/m68k/platform/68000/m68328.c b/arch/m68k/platform/68000/m68328.c
index a86eb66..e53caf4 100644
--- a/arch/m68k/platform/68000/m68328.c
+++ b/arch/m68k/platform/68000/m68328.c
@@ -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");
diff --git a/arch/m68k/platform/68000/m68EZ328.c b/arch/m68k/platform/68000/m68EZ328.c
index a6eb72d..332b5e8 100644
--- a/arch/m68k/platform/68000/m68EZ328.c
+++ b/arch/m68k/platform/68000/m68EZ328.c
@@ -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;
diff --git a/arch/m68k/platform/68000/m68VZ328.c b/arch/m68k/platform/68000/m68VZ328.c
index eb6964f..42e1ada 100644
--- a/arch/m68k/platform/68000/m68VZ328.c
+++ b/arch/m68k/platform/68000/m68VZ328.c
@@ -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");
diff --git a/arch/m68k/platform/68360/config.c b/arch/m68k/platform/68360/config.c
index 9877cef..0570741 100644
--- a/arch/m68k/platform/68360/config.c
+++ b/arch/m68k/platform/68360/config.c
@@ -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;
--
1.7.9.5
Hi Geert,
On 26/06/13 05:40, Geert Uytterhoeven wrote:
> Some instances of config_BSP() lack an __init annotation.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
Acked-by: Greg Ungerer <[email protected]>
Looks good. Are you going to push it via your tree, or do you want
me too?
Regards
Greg
> ---
> 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(-)
>
> diff --git a/arch/m68k/platform/68000/m68328.c b/arch/m68k/platform/68000/m68328.c
> index a86eb66..e53caf4 100644
> --- a/arch/m68k/platform/68000/m68328.c
> +++ b/arch/m68k/platform/68000/m68328.c
> @@ -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");
> diff --git a/arch/m68k/platform/68000/m68EZ328.c b/arch/m68k/platform/68000/m68EZ328.c
> index a6eb72d..332b5e8 100644
> --- a/arch/m68k/platform/68000/m68EZ328.c
> +++ b/arch/m68k/platform/68000/m68EZ328.c
> @@ -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;
>
> diff --git a/arch/m68k/platform/68000/m68VZ328.c b/arch/m68k/platform/68000/m68VZ328.c
> index eb6964f..42e1ada 100644
> --- a/arch/m68k/platform/68000/m68VZ328.c
> +++ b/arch/m68k/platform/68000/m68VZ328.c
> @@ -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");
>
> diff --git a/arch/m68k/platform/68360/config.c b/arch/m68k/platform/68360/config.c
> index 9877cef..0570741 100644
> --- a/arch/m68k/platform/68360/config.c
> +++ b/arch/m68k/platform/68360/config.c
> @@ -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;
>
>
On Thu, Jun 27, 2013 at 1:08 AM, Greg Ungerer <[email protected]> wrote:
> On 26/06/13 05:40, Geert Uytterhoeven wrote:
>>
>> Some instances of config_BSP() lack an __init annotation.
>>
>> Signed-off-by: Geert Uytterhoeven <[email protected]>
>
>
> Acked-by: Greg Ungerer <[email protected]>
>
> 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
Hi Geert,
On 27/06/13 16:49, Geert Uytterhoeven wrote:
> On Thu, Jun 27, 2013 at 1:08 AM, Greg Ungerer <[email protected]> wrote:
>> On 26/06/13 05:40, Geert Uytterhoeven wrote:
>>>
>>> Some instances of config_BSP() lack an __init annotation.
>>>
>>> Signed-off-by: Geert Uytterhoeven <[email protected]>
>>
>>
>> Acked-by: Greg Ungerer <[email protected]>
>>
>> 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