From ff568d0a03bd696e01805a9fac12c52aad2767d6 Mon Sep 17 00:00:00 2001
From: Eddie Kohler <ekohler@gmail.com>
Date: Fri, 27 Nov 2009 19:52:37 -0800
Subject: [PATCH] Configury: #include <asm/types.h> for --enable-fixincludes
 compilability.

Required now that we use "BITS_PER_LONG."
---
 config-linuxmodule.h.in |  2 ++
 configure               | 17 +++++++++++++++++
 configure.in            |  3 ++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/config-linuxmodule.h.in b/config-linuxmodule.h.in
index 312966207d..7c619d6b78 100644
--- a/config-linuxmodule.h.in
+++ b/config-linuxmodule.h.in
@@ -149,9 +149,11 @@
 #include <linux/version.h>
 #ifdef __cplusplus
 # include <click/cxxprotect.h>
+# include <asm/types.h>
 # include <linux/types.h>
 # include <click/cxxunprotect.h>
 #else
+# include <asm/types.h>
 # include <linux/types.h>
 #endif
 typedef ptrdiff_t intptr_t;
diff --git a/configure b/configure
index baa0878467..d2821743a2 100755
--- a/configure
+++ b/configure
@@ -9818,6 +9818,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <linux/signal.h>
 #include <linux/skbuff.h>
 int
@@ -9865,6 +9866,7 @@ else
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <linux/types.h>
 void f1(long) {
 }
@@ -9919,6 +9921,7 @@ else
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <linux/types.h>
 void f1(long long) {
 }
@@ -9973,6 +9976,7 @@ else
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <linux/types.h>
 
 int
@@ -10030,6 +10034,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <linux/skbuff.h>
 int
 main ()
@@ -10085,6 +10090,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <linux/skbuff.h>
 int
 main ()
@@ -10140,6 +10146,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <linux/skbuff.h>
 int
 main ()
@@ -10195,6 +10202,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <linux/skbuff.h>
 int
 main ()
@@ -10250,6 +10258,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <linux/skbuff.h>
 int
 main ()
@@ -10305,6 +10314,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <linux/skbuff.h>
 int
 main ()
@@ -10360,6 +10370,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <linux/netdevice.h>
 int
 main ()
@@ -10402,6 +10413,7 @@ $as_echo "#define HAVE_LINUX_POLLING 1" >>confdefs.h
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <net/dst.h>
 "
 if test "x$ac_cv_have_decl_skb_dst_drop" = x""yes; then :
@@ -10434,6 +10446,7 @@ $as_echo "#define HAVE_SKB_DST_DROP 1" >>confdefs.h
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <linux/skbuff.h>
 "
 if test "x$ac_cv_have_decl_skb_recycle" = x""yes; then :
@@ -10479,6 +10492,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <linux/netdevice.h>
 int
 main ()
@@ -10527,6 +10541,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 "
@@ -10560,6 +10575,7 @@ $as_echo "#define HAVE_NET_ENABLE_TIMESTAMP 1" >>confdefs.h
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 "
@@ -10593,6 +10609,7 @@ $as_echo "#define HAVE_NETIF_TX_LOCK 1" >>confdefs.h
 #define false linux_false
 #define true linux_true
 #include <linux/autoconf.h>
+#include <asm/types.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 "
diff --git a/configure.in b/configure.in
index 2f90a87203..43b576a6b4 100644
--- a/configure.in
+++ b/configure.in
@@ -1138,7 +1138,8 @@ fixincludes.pl execution failed.
 #define namespace linux_namespace
 #define false linux_false
 #define true linux_true
-#include <linux/autoconf.h>]])
+#include <linux/autoconf.h>
+#include <asm/types.h>]])
 
 
     AC_CACHE_CHECK([for C++-includable kernel header files], [ac_cv_cxx_aware_system],