[kernel] r16090 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Fri Aug  6 00:45:35 2010
New Revision: 16090

Log:
CIFS: Fix build breakage on some architectures

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/CIFS-Include-linux-init.h-in-dns_resolve.h.patch
   dists/sid/linux-2.6/debian/patches/series/20
Modified:
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Thu Aug  5 23:10:43 2010	(r16089)
+++ dists/sid/linux-2.6/debian/changelog	Fri Aug  6 00:45:35 2010	(r16090)
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.32-20) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * CIFS: Fix build breakage on some architectures
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Fri, 06 Aug 2010 01:39:38 +0100
+
 linux-2.6 (2.6.32-19) unstable; urgency=low
 
   [ maximilian attems ]

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/CIFS-Include-linux-init.h-in-dns_resolve.h.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/CIFS-Include-linux-init.h-in-dns_resolve.h.patch	Fri Aug  6 00:45:35 2010	(r16090)
@@ -0,0 +1,34 @@
+From b336eaf001b1950906ae9dc3633a0f48290457aa Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Fri, 6 Aug 2010 01:35:21 +0100
+Subject: [PATCH] CIFS: Include <linux/init.h> in dns_resolve.h
+
+fs/cifs/dns_resolve.c fails to build on some architectures:
+
+In file included from fs/cifs/dns_resolve.c:29:
+fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'cifs_init_dns_resolver'
+fs/cifs/dns_resolve.h:28: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'cifs_exit_dns_resolver'
+
+We need to include <linux/init.h> to ensure that __init and __exit
+are defined.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ fs/cifs/dns_resolve.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/fs/cifs/dns_resolve.h b/fs/cifs/dns_resolve.h
+index 26b9eaa..e55fa28 100644
+--- a/fs/cifs/dns_resolve.h
++++ b/fs/cifs/dns_resolve.h
+@@ -24,6 +24,7 @@
+ #define _DNS_RESOLVE_H
+ 
+ #ifdef __KERNEL__
++#include <linux/init.h>
+ extern int __init cifs_init_dns_resolver(void);
+ extern void __exit cifs_exit_dns_resolver(void);
+ extern int dns_resolve_server_name_to_ip(const char *unc, char **ip_addr);
+-- 
+1.7.1
+

Added: dists/sid/linux-2.6/debian/patches/series/20
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/series/20	Fri Aug  6 00:45:35 2010	(r16090)
@@ -0,0 +1 @@
++ bugfix/all/CIFS-Include-linux-init.h-in-dns_resolve.h.patch