2006-01-06 15:17:49

by Luiz Fernando N. Capitulino

Subject: [PATCH] pktgen: Adds missing __init.

pktgen_find_thread() and pktgen_create_thread() are only called at
initialization time.

Signed-off-by: Luiz Capitulino <[email protected]>

net/core/pktgen.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 06cad2d..5eeae0d 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2883,7 +2883,7 @@ static int pktgen_add_device(struct pktg
return add_dev_to_thread(t, pkt_dev);
}

-static struct pktgen_thread *pktgen_find_thread(const char* name)
+static struct pktgen_thread __init *pktgen_find_thread(const char* name)
{
struct pktgen_thread *t = NULL;

@@ -2900,7 +2900,7 @@ static struct pktgen_thread *pktgen_find
return t;
}

-static int pktgen_create_thread(const char* name, int cpu)
+static int __init pktgen_create_thread(const char* name, int cpu)
{
struct pktgen_thread *t = NULL;
struct proc_dir_entry *pe;


--
Luiz Fernando N. Capitulino

2006-01-06 19:05:17

by Jan Engelhardt

Subject: Re: [PATCH] pktgen: Adds missing __init.

>diff --git a/net/core/pktgen.c b/net/core/pktgen.c
>index 06cad2d..5eeae0d 100644
>--- a/net/core/pktgen.c
>+++ b/net/core/pktgen.c
>@@ -2883,7 +2883,7 @@ static int pktgen_add_device(struct pktg
> return add_dev_to_thread(t, pkt_dev);
> }
>
>-static struct pktgen_thread *pktgen_find_thread(const char* name)
>+static struct pktgen_thread __init *pktgen_find_thread(const char* name)

I do not know what CodingStyle says about it (it is correct GCC code),
what do the others think of the more often placement of __init as in
__init static struct pktgen_thread *pktgen_find_thread(const char *name)
or
static __init struct pktgen_thread *pktgen_find_thread(const char *name)
[depending on what people like]



Jan Engelhardt
--

2006-01-06 21:20:27

by David Miller

Subject: Re: [PATCH] pktgen: Adds missing __init.

From: Jan Engelhardt <[email protected]>
Date: Fri, 6 Jan 2006 20:04:13 +0100 (MET)

> >diff --git a/net/core/pktgen.c b/net/core/pktgen.c
> >index 06cad2d..5eeae0d 100644
> >--- a/net/core/pktgen.c
> >+++ b/net/core/pktgen.c
> >@@ -2883,7 +2883,7 @@ static int pktgen_add_device(struct pktg
> > return add_dev_to_thread(t, pkt_dev);
> > }
> >
> >-static struct pktgen_thread *pktgen_find_thread(const char* name)
> >+static struct pktgen_thread __init *pktgen_find_thread(const char* name)
>
> I do not know what CodingStyle says about it (it is correct GCC code),
> what do the others think of the more often placement of __init as in
> __init static struct pktgen_thread *pktgen_find_thread(const char *name)
> or
> static __init struct pktgen_thread *pktgen_find_thread(const char *name)
> [depending on what people like]

It should be right before the function name, "struct foo *" is a full
return type specification, so any other attributes should appear either
before or after that.

I'll fix this up when I apply Luis's patch.