Merge with 2.4.0-test4-pre2.

12 files changed, 18 insertions, 29 deletions

diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h
index d2334ba95..63edac9d6 100644
--- a/include/linux/arcdevice.h
+++ b/include/linux/arcdevice.h
@@ -95,7 +95,7 @@ extern int arcnet_debug;
 
 /* see how long a function call takes to run, expressed in CPU cycles */
 #define TIME(name, bytes, call) BUGLVL(D_TIMING) { \
-	    cycles_t _x, _y; \
+	    unsigned long _x, _y; \
 	    _x = get_cycles(); \
 	    call; \
 	    _y = get_cycles(); \
diff --git a/include/linux/hdlcdrv.h b/include/linux/hdlcdrv.h
index a882aaea5..10f3f71ee 100644
--- a/include/linux/hdlcdrv.h
+++ b/include/linux/hdlcdrv.h
@@ -240,11 +240,7 @@ struct hdlcdrv_state {
 	struct hdlcdrv_bitbuffer bitbuf_hdlc;
 #endif /* HDLCDRV_DEBUG */
 
-#if LINUX_VERSION_CODE < 0x20119
-	struct enet_statistics stats;
-#else
 	struct net_device_stats stats;
-#endif
 	int ptt_keyed;
 
 	/* queued skb for transmission */
diff --git a/include/linux/if_eql.h b/include/linux/if_eql.h
index 03c80ef58..8cc5867e2 100644
--- a/include/linux/if_eql.h
+++ b/include/linux/if_eql.h
@@ -56,7 +56,7 @@ typedef struct equalizer {
   slave_queue_t *queue;
   int min_slaves;
   int max_slaves;
-  struct enet_statistics *stats;
+  struct net_device_stats *stats;
   struct timer_list timer;
   char timer_on;
 } equalizer_t;  
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 67ded69e1..61e5f5c6b 100644
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -90,12 +90,4 @@ struct ethhdr
 	unsigned short	h_proto;		/* packet type ID field	*/
 };
 
-/*
- *	We Have changed the ethernet statistics collection data. This
- *	is just for partial compatibility for now.
- */
- 
- 
-#define enet_statistics net_device_stats
-
 #endif	/* _LINUX_IF_ETHER_H */
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h
index 7a2fe04e3..3765c740f 100644
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
@@ -154,7 +154,7 @@ struct frhdr
 
 struct dlci_local
 {
-   struct enet_statistics stats;
+   struct net_device_stats stats;
    struct net_device          *slave;
    struct dlci_conf       config;
    int                    configured;
@@ -165,7 +165,7 @@ struct dlci_local
 
 struct frad_local
 {
-   struct enet_statistics stats;
+   struct net_device_stats stats;
 
    /* devices which this FRAD is slaved to */
    struct net_device     *master[CONFIG_DLCI_MAX];
diff --git a/include/linux/if_pppvar.h b/include/linux/if_pppvar.h
index 7603d29cd..e79239fd3 100644
--- a/include/linux/if_pppvar.h
+++ b/include/linux/if_pppvar.h
@@ -128,7 +128,7 @@ struct ppp {
 	int	 sc_xfer;		/* PID of reserved PPP table */
 	char	name[16];		/* space for unit name */
 	struct net_device	dev;		/* net device structure */
-	struct enet_statistics estats;	/* more detailed stats */
+	struct net_device_stats estats;	/* more detailed stats */
 
 	/* tty output buffer */
 	unsigned char	obuf[OBUFSIZE];	/* buffer for characters to send */
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index c916a8fa0..909ce0683 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -681,7 +681,7 @@ typedef struct {
 typedef struct isdn_net_local_s {
   ulong                  magic;
   char                   name[10];     /* Name of device                   */
-  struct enet_statistics stats;        /* Ethernet Statistics              */
+  struct net_device_stats stats;        /* Ethernet Statistics              */
   int                    isdn_device;  /* Index to isdn-device             */
   int                    isdn_channel; /* Index to isdn-channel            */
   int			 ppp_slot;     /* PPPD device slot number          */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index e6325a298..f418100a9 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -316,9 +316,6 @@ extern struct page * alloc_pages_node(int nid, int gfp_mask, unsigned long order
 #ifndef CONFIG_DISCONTIGMEM
 static inline struct page * alloc_pages(int gfp_mask, unsigned long order)
 {
-	/*  temporary check. */
-	if (contig_page_data.node_zonelists[gfp_mask].gfp_mask != (gfp_mask))
-		BUG();
 	/*
 	 * Gets optimized away by the compiler.
 	 */
diff --git a/include/linux/poll.h b/include/linux/poll.h
index b56cdcf4c..bc0fcde22 100644
--- a/include/linux/poll.h
+++ b/include/linux/poll.h
@@ -17,13 +17,18 @@ struct poll_table_entry {
 	wait_queue_head_t * wait_address;
 };
 
-typedef struct poll_table_struct {
-	struct poll_table_struct * next;
+struct poll_table_page {
+	struct poll_table_page * next;
 	unsigned int nr;
 	struct poll_table_entry * entry;
+};
+
+typedef struct poll_table_struct {
+	int error;
+	struct poll_table_page * table;
 } poll_table;
 
-#define __MAX_POLL_TABLE_ENTRIES ((PAGE_SIZE - sizeof (poll_table)) / sizeof (struct poll_table_entry))
+#define __MAX_POLL_TABLE_ENTRIES ((PAGE_SIZE - sizeof (struct poll_table_page)) / sizeof (struct poll_table_entry))
 
 extern void __pollwait(struct file * filp, wait_queue_head_t * wait_address, poll_table *p);
 
diff --git a/include/linux/types.h b/include/linux/types.h
index 196c5f4e0..df4808fcd 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -1,7 +1,10 @@
 #ifndef _LINUX_TYPES_H
 #define _LINUX_TYPES_H
 
+#ifdef	__KERNEL__
 #include <linux/config.h>
+#endif
+
 #include <linux/posix_types.h>
 #include <asm/types.h>
 
diff --git a/include/linux/wait.h b/include/linux/wait.h
index 6ac1f0e88..222923aca 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -21,7 +21,7 @@
  * Temporary debugging help until all code is converted to the new
  * waitqueue usage.
  */
-#define WAITQUEUE_DEBUG 1
+#define WAITQUEUE_DEBUG 0
 
 #if WAITQUEUE_DEBUG
 extern int printk(const char *fmt, ...);
diff --git a/include/linux/wanrouter.h b/include/linux/wanrouter.h
index 7efa6a9c1..736493d1d 100644
--- a/include/linux/wanrouter.h
+++ b/include/linux/wanrouter.h
@@ -440,11 +440,7 @@ typedef struct wan_device
 					/****** status and statistics *******/
 	char state;			/* device state */
 	char api_status;		/* device api status */
-#ifdef LINUX_2_1
 	struct net_device_stats stats; 	/* interface statistics */
-#else
-	struct enet_statistics stats;	/* interface statistics */
-#endif
 	unsigned reserved[16];		/* reserved for future use */
 	unsigned critical;		/* critical section flag */
 					/****** device management methods ***/