[26/34] CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition

[26/34] CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition

[Greg KH]

2.6.32-stable review patch.  If anyone has any objections, please let us know.

------------------
 [stable] [PATCH 2.6.32/stable] CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition

From: Michael Neuling <mikey-/owAOxkjmzZAfugRpC6u6w@public.gmane.org>

An allmodconfig compile on ppc64 with 2.6.32.17 currently gives this error

fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'cifs_init_dns_resolver'

This adds the correct header file to fix this.

Signed-off-by: Michael Neuling <mikey-/owAOxkjmzZAfugRpC6u6w@public.gmane.org>
Cc: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Greg Kroah-Hartman <gregkh-l3A5Bk7waGM@public.gmane.org>

---
 fs/cifs/dns_resolve.h |    2 ++
 1 file changed, 2 insertions(+)

--- a/fs/cifs/dns_resolve.h
+++ b/fs/cifs/dns_resolve.h
@@ -24,6 +24,8 @@
 #define _DNS_RESOLVE_H
 
 #ifdef __KERNEL__
+#include <linux/module.h>
+
 extern int __init cifs_init_dns_resolver(void);
 extern void cifs_exit_dns_resolver(void);
 extern int dns_resolve_server_name_to_ip(const char *unc, char **ip_addr);

Re: [Stable-review] [26/34] CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 758 bytes --]

On Fri, 2010-08-06 at 11:57 -0700, Greg KH wrote:
> 2.6.32-stable review patch.  If anyone has any objections, please let us know.
> 
> ------------------
>  [stable] [PATCH 2.6.32/stable] CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition
> 
> From: Michael Neuling <mikey-/owAOxkjmzZAfugRpC6u6w@public.gmane.org>
> 
> An allmodconfig compile on ppc64 with 2.6.32.17 currently gives this error
> 
> fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'cifs_init_dns_resolver'
> 
> This adds the correct header file to fix this.
[...]

Why <linux/module.h> and not <linux/init.h>?

Ben.

-- 
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]

Re: [Stable-review] [26/34] CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition

[Greg KH]

On Fri, Aug 06, 2010 at 09:53:17PM +0100, Ben Hutchings wrote:
> On Fri, 2010-08-06 at 11:57 -0700, Greg KH wrote:
> > 2.6.32-stable review patch.  If anyone has any objections, please let us know.
> > 
> > ------------------
> >  [stable] [PATCH 2.6.32/stable] CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition
> > 
> > From: Michael Neuling <mikey-/owAOxkjmzZAfugRpC6u6w@public.gmane.org>
> > 
> > An allmodconfig compile on ppc64 with 2.6.32.17 currently gives this error
> > 
> > fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'cifs_init_dns_resolver'
> > 
> > This adds the correct header file to fix this.
> [...]
> 
> Why <linux/module.h> and not <linux/init.h>?

Heh, it works :)

Michael?

thanks,

greg k-h

Re: [Stable-review] [26/34] CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition

[Michael Neuling]

In message <20100806210619.GA5863-l3A5Bk7waGM@public.gmane.org> you wrote:
> On Fri, Aug 06, 2010 at 09:53:17PM +0100, Ben Hutchings wrote:
> > On Fri, 2010-08-06 at 11:57 -0700, Greg KH wrote:
> > > 2.6.32-stable review patch.  If anyone has any objections, please let us 
know.
> > > 
> > > ------------------
> > >  [stable] [PATCH 2.6.32/stable] CIFS: Fix compile error with __init in ci
fs_init_dns_resolver() definition
> > > 
> > > From: Michael Neuling <mikey-/owAOxkjmzZAfugRpC6u6w@public.gmane.org>
> > > 
> > > An allmodconfig compile on ppc64 with 2.6.32.17 currently gives this erro
r
> > > 
> > > fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attr
ibute__' before 'cifs_init_dns_resolver'
> > > 
> > > This adds the correct header file to fix this.
> > [...]
> > 
> > Why <linux/module.h> and not <linux/init.h>?
> 
> Heh, it works :)
> 
> Michael?

It's what David Howells wanted.....

http://linux.derkeiler.com/Mailing-Lists/Kernel/2010-08/msg01316.html
(below as well)


> An allmodconfig compile on ppc64 with 2.6.32.17 currently gives this error
> 
> fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'cifs_init_dns_resolver'
> 
> This removes the __init from cifs_init_dns_resolver()

That's not really a good idea as the assembler may choose different pieces of
assembly to do variable references and jumps, depending on the section
information.

A better fix is to add:

	#include <linux/module.h>

to the header file.

David