[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20749.1280874733@neuling.org>
Date: Wed, 04 Aug 2010 08:32:13 +1000
From: Michael Neuling <mikey@...ling.org>
To: David Howells <dhowells@...hat.com>
cc: stable@...nel.org, linux-cifs@...r.kernel.org,
linux-kernel@...r.kernel.org, Jeff Layton <jlayton@...hat.com>
Subject: [PATCH 2.6.32/stable] CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition
In message <12482.1280871625@...hat.com> you wrote:
> Michael Neuling <mikey@...ling.org> wrote:
>
> > An allmodconfig compile on ppc64 with 2.6.32.17 currently gives this error
> >
> > fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attrib
ute__' 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.
Ok, new patch below.
CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition
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@...ling.org>
cc: stable@...nel.org (for 2.6.32)
Index: linux-2.6-ozlabs/fs/cifs/dns_resolve.h
===================================================================
--- linux-2.6-ozlabs.orig/fs/cifs/dns_resolve.h
+++ linux-2.6-ozlabs/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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists