Re: [PATCH] Make net/ipx/ipx_proc.c compile w/o CONFIG_PROC_FS

[Arnaldo Carvalho de Melo <acme@conectiva.com.br>]

Em Thu, Oct 09, 2003 at 10:58:57PM -0700, Noah J. Misch escreveu:
> Hello Arnaldo,
> 
> This is a trivial patch against ipx_proc.c that allows it to compile with
> CONFIG_PROC_FS unset.  The patch simply makes ipx_proc.c include init.h
> unconditionally, which ensures that __init and __exit are always defined.
> 
> This patch depends upon the patch "Make linux/init.h include linux/compiler.h",
> which I have CC-ed to all recipients of this patch.  Should Linus decline that
> patch, I can make the trivial changes necessary to make this patch work on its
> own, if you wish.
> 
> Thanks,
> Noah

I don't have any problem with this patch, Dave, could you please apply it?

- Arnaldo
 
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1342  -> 1.1343
#	  net/ipx/ipx_proc.c	1.9     -> 1.10
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/10/10	noah@caltech.edu	1.1343
# This file needs the __init macro in all cases, so include init.h
# regardless of CONFIG_PROC_FS.  This fixes a compilation error in
# the absence of CONFIG_PROC_FS.
# --------------------------------------------
#
diff -Nru a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
--- a/net/ipx/ipx_proc.c	Fri Oct 10 01:05:06 2003
+++ b/net/ipx/ipx_proc.c	Fri Oct 10 01:05:06 2003
@@ -5,8 +5,8 @@
  */

 #include <linux/config.h>
-#ifdef CONFIG_PROC_FS
 #include <linux/init.h>
+#ifdef CONFIG_PROC_FS
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/seq_file.h>