Re: [Drbd-dev] [PATCH] linux-next: 20090926 - drop autoconf.h from DRBD driver

Re: [Drbd-dev] [PATCH] linux-next: 20090926 - drop autoconf.h from DRBD driver

[Stephen Rothwell]

Hi Greg, Philipp,

On Sat, 26 Sep 2009 22:08:39 +0200 Sam Ravnborg <sam@ravnborg.org> wrote:
>
> On Sat, Sep 26, 2009 at 11:01:43PM +0530, Kamalesh Babulal wrote:
> > 
> > 	next-20090926 allyesconfig build breaks on powerpc,
> > 
> > drivers/block/drbd/drbd_proc.c:26:28: error: linux/autoconf.h: No such file or directory
> > make[3]: *** [drivers/block/drbd/drbd_proc.o] Error 1
> > 
> > dropping autoconf.h from drbd_proc.c helps. The cleanup patch drops the
> > unneeded include autoconf.h.
> > 
> > Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
> 
> I only checked upstream - so this is no big suprise.
> As there is no need to explicitly include autoconf.h this
> change should be included by the drdb folks even if the
> stuff I have does not hit upstream.

Maybe we should let them know (cc'd).

> Can I ask you to audit the rest of -next for similar issues.
> A 'git grep "autoconf\.h"' should be a qucik way to find other
> spots to fix up.

$ git grep -l -w autoconf.h next-20090926
next-20090926:Documentation/dontdiff
next-20090926:Documentation/kbuild/kconfig.txt
next-20090926:Makefile
next-20090926:arch/m68k/kernel/head.S
next-20090926:drivers/block/drbd/drbd_main.c
next-20090926:drivers/block/drbd/drbd_nl.c
next-20090926:drivers/block/drbd/drbd_proc.c
next-20090926:drivers/block/drbd/drbd_receiver.c
next-20090926:drivers/block/drbd/drbd_req.c
next-20090926:drivers/block/drbd/drbd_req.h
next-20090926:drivers/block/drbd/drbd_worker.c
next-20090926:drivers/staging/cowloop/cowloop.c
next-20090926:drivers/staging/iio/ring_sw.h
next-20090926:scripts/basic/fixdep.c
next-20090926:scripts/kconfig/confdata.c
next-20090926:scripts/mkcompile_h

Of these, only the dives/block/drbd and drivers/staging ones are actual
includes.

So for Greg and Philipp, Sam has added a patch that moves autoconf.h.
There is no need to include it anywhere anyway, so the above files need
cleaning up.  I have appended Kamalesh's patch below.  Greg, you may have
to write your own :-)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Date:	Sat, 26 Sep 2009 23:01:43 +0530
From:	Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
To:	sam@ravnborg.org
Cc:	linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	linux-kbuild@vger.kernel.org, sfr@canb.auug.org.au
Subject: [PATCH] linux-next: 20090926 - drop autoconf.h from DRBD driver

Hi Sam,

	next-20090926 allyesconfig build breaks on powerpc,

drivers/block/drbd/drbd_proc.c:26:28: error: linux/autoconf.h: No such file or directory
make[3]: *** [drivers/block/drbd/drbd_proc.o] Error 1

dropping autoconf.h from drbd_proc.c helps. The cleanup patch drops the
unneeded include autoconf.h.

Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
--
 drivers/block/drbd/drbd_main.c     |    1 -
 drivers/block/drbd/drbd_nl.c       |    1 -
 drivers/block/drbd/drbd_proc.c     |    1 -
 drivers/block/drbd/drbd_receiver.c |    1 -
 drivers/block/drbd/drbd_req.c      |    1 -
 drivers/block/drbd/drbd_req.h      |    1 -
 drivers/block/drbd/drbd_worker.c   |    1 -
 drivers/staging/cowloop/cowloop.c  |    4 ----
 drivers/staging/iio/ring_sw.h      |    1 -
 9 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index edf0b80..80273f2 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -26,7 +26,6 @@
 
  */
 
-#include <linux/autoconf.h>
 #include <linux/module.h>
 #include <linux/version.h>
 #include <linux/drbd.h>
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 1927ace..cfde310 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -23,7 +23,6 @@
 
  */
 
-#include <linux/autoconf.h>
 #include <linux/module.h>
 #include <linux/drbd.h>
 #include <linux/in.h>
diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c
index 98fcb74..bdd0b49 100644
--- a/drivers/block/drbd/drbd_proc.c
+++ b/drivers/block/drbd/drbd_proc.c
@@ -23,7 +23,6 @@
 
  */
 
-#include <linux/autoconf.h>
 #include <linux/module.h>
 
 #include <asm/uaccess.h>
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 63686c4..2f81821 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -23,7 +23,6 @@
  */
 
 
-#include <linux/autoconf.h>
 #include <linux/module.h>
 
 #include <asm/uaccess.h>
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 0656cf1..1aaa397 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -23,7 +23,6 @@
 
  */
 
-#include <linux/autoconf.h>
 #include <linux/module.h>
 
 #include <linux/slab.h>
diff --git a/drivers/block/drbd/drbd_req.h b/drivers/block/drbd/drbd_req.h
index d37ab57..f22c1bc 100644
--- a/drivers/block/drbd/drbd_req.h
+++ b/drivers/block/drbd/drbd_req.h
@@ -25,7 +25,6 @@
 #ifndef _DRBD_REQ_H
 #define _DRBD_REQ_H
 
-#include <linux/autoconf.h>
 #include <linux/module.h>
 
 #include <linux/slab.h>
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 212e954..34a4b3e 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -23,7 +23,6 @@
 
  */
 
-#include <linux/autoconf.h>
 #include <linux/module.h>
 #include <linux/version.h>
 #include <linux/drbd.h>
diff --git a/drivers/staging/cowloop/cowloop.c b/drivers/staging/cowloop/cowloop.c
index a71c743..a21b9b4 100644
--- a/drivers/staging/cowloop/cowloop.c
+++ b/drivers/staging/cowloop/cowloop.c
@@ -237,10 +237,6 @@ char revision[] = "$Revision: 3.1 $"; /* cowlo_init_module() has
 #endif
 
 #include <linux/types.h>
-#include <linux/autoconf.h>
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
 #include <linux/module.h>
 #include <linux/version.h>
 #include <linux/moduleparam.h>
diff --git a/drivers/staging/iio/ring_sw.h b/drivers/staging/iio/ring_sw.h
index ae70ee0..4b0de7c 100644
--- a/drivers/staging/iio/ring_sw.h
+++ b/drivers/staging/iio/ring_sw.h
@@ -29,7 +29,6 @@
  * driver requests - some may support multiple options */
 
 
-#include <linux/autoconf.h>
 #include "iio.h"
 #include "ring_generic.h"
 

Re: [Drbd-dev] [PATCH] linux-next: 20090926 - drop autoconf.h from DRBD driver

[Stephen Rothwell]

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

On Sun, 27 Sep 2009 12:53:31 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> So for Greg and Philipp, Sam has added a patch that moves autoconf.h.
> There is no need to include it anywhere anyway, so the above files need
> cleaning up.  I have appended Kamalesh's patch below.  Greg, you may have
> to write your own :-)

I should read the patch :-).  Greg, obviously Kamalesh's patch hits the
staging files as well.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: [Drbd-dev] [PATCH] linux-next: 20090926 - drop autoconf.h from DRBD driver

[Lars Ellenberg]

On Sun, Sep 27, 2009 at 12:53:31PM +1000, Stephen Rothwell wrote:
> Hi Greg, Philipp,
> 
> On Sat, 26 Sep 2009 22:08:39 +0200 Sam Ravnborg <sam@ravnborg.org> wrote:
> >
> > On Sat, Sep 26, 2009 at 11:01:43PM +0530, Kamalesh Babulal wrote:
> > > 
> > > 	next-20090926 allyesconfig build breaks on powerpc,
> > > 
> > > drivers/block/drbd/drbd_proc.c:26:28: error: linux/autoconf.h: No such file or directory
> > > make[3]: *** [drivers/block/drbd/drbd_proc.o] Error 1
> > > 
> > > dropping autoconf.h from drbd_proc.c helps. The cleanup patch drops the
> > > unneeded include autoconf.h.
> > > 
> > > Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
> > 
> > I only checked upstream - so this is no big suprise.
> > As there is no need to explicitly include autoconf.h this
> > change should be included by the drdb folks even if the
> > stuff I have does not hit upstream.
> 
> Maybe we should let them know (cc'd).


Thanks ;)
owed to our out-of-tree "backwards" compatibility for all 2.6 kernels
back to 2.6.5 (I think...).

includes have been dropped.

-- 
: Lars Ellenberg
: LINBIT | Your Way to High Availability
: DRBD/HA support and consulting http://www.linbit.com

DRBD® and LINBIT® are registered trademarks of LINBIT, Austria.