Merge with Linux 2.4.0.

13 files changed, 59 insertions, 19 deletions

diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 695d4bb67..0d6f9ac13 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -115,6 +115,7 @@ d_iput:		no		no		yes
 					 * If this dentry points to a directory, then
 					 * s_nfsd_free_path semaphore will be down
 					 */
+#define DCACHE_REFERENCED	0x0008  /* Recently used, don't discard. */
 
 extern spinlock_t dcache_lock;
 
diff --git a/include/linux/delay.h b/include/linux/delay.h
index 0454b786d..fc57b1c89 100644
--- a/include/linux/delay.h
+++ b/include/linux/delay.h
@@ -13,7 +13,7 @@ extern unsigned long loops_per_jiffy;
 
 /*
  * Using udelay() for intervals greater than a few milliseconds can
- * risk overflow for high loops_per_sec (high bogomips) machines. The
+ * risk overflow for high loops_per_jiffy (high bogomips) machines. The
  * mdelay() provides a wrapper to prevent this.  For delays greater
  * than MAX_UDELAY_MS milliseconds, the wrapper is used.  Architecture
  * specific values can be defined in asm-???/delay.h as an override.
diff --git a/include/linux/mc146818rtc.h b/include/linux/mc146818rtc.h
index cab50dd9e..455acd9ab 100644
--- a/include/linux/mc146818rtc.h
+++ b/include/linux/mc146818rtc.h
@@ -15,6 +15,8 @@
 #include <linux/rtc.h>			/* get the user-level API */
 #include <asm/mc146818rtc.h>		/* register access macros */
 
+extern spinlock_t rtc_lock;		/* serialize CMOS RAM access */
+
 /**********************************************************************
  * register summary
  **********************************************************************/
diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h
index a8fd001bc..f1ff9ecb4 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack.h
@@ -101,7 +101,7 @@ struct ip_conntrack
 	struct ip_conntrack_tuple_hash tuplehash[IP_CT_DIR_MAX];
 
 	/* Have we seen traffic both ways yet? (bitset) */
-	volatile unsigned int status;
+	volatile unsigned long status;
 
 	/* Timer function; drops refcnt when it goes off. */
 	struct timer_list timeout;
diff --git a/include/linux/netfilter_ipv4/lockhelp.h b/include/linux/netfilter_ipv4/lockhelp.h
index 89dd63f9f..46a688e59 100644
--- a/include/linux/netfilter_ipv4/lockhelp.h
+++ b/include/linux/netfilter_ipv4/lockhelp.h
@@ -19,8 +19,8 @@ struct spinlock_debug
 struct rwlock_debug
 {
 	rwlock_t l;
-	int read_locked_map;
-	int write_locked_map;
+	long read_locked_map;
+	long write_locked_map;
 };
 
 #define DECLARE_LOCK(l) 						\
diff --git a/include/linux/netfilter_ipv6.h b/include/linux/netfilter_ipv6.h
index aa1ad6f0f..f6da04e49 100644
--- a/include/linux/netfilter_ipv6.h
+++ b/include/linux/netfilter_ipv6.h
@@ -54,7 +54,7 @@
 #define NF_IP6_NUMHOOKS		5
 
 
-enum nf_ip_hook_priorities {
+enum nf_ip6_hook_priorities {
 	NF_IP6_PRI_FIRST = INT_MIN,
 	NF_IP6_PRI_CONNTRACK = -200,
 	NF_IP6_PRI_MANGLE = -150,
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 2b2a461b8..2490818f4 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -358,6 +358,7 @@
 #define PCI_DEVICE_ID_SI_601		0x0601
 #define PCI_DEVICE_ID_SI_620		0x0620
 #define PCI_DEVICE_ID_SI_630		0x0630
+#define PCI_DEVICE_ID_SI_730		0x0730         
 #define PCI_DEVICE_ID_SI_630_VGA	0x6300
 #define PCI_DEVICE_ID_SI_730_VGA	0x7300
 #define PCI_DEVICE_ID_SI_5107		0x5107
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index ea2226d1f..fba9111da 100644
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -2,6 +2,8 @@
  * Generic RTC interface.
  * This version contains the part of the user interface to the Real Time Clock
  * service. It is used with both the legacy mc146818 and also  EFI
+ * Struct rtc_time and first 12 ioctl by Paul Gortmaker, 1996 - separated out
+ * from <linux/mc146818rtc.h> to this file for 2.4 kernels.
  * 
  * Copyright (C) 1999 Hewlett-Packard Co.
  * Copyright (C) 1999 Stephane Eranian <eranian@hpl.hp.com>
diff --git a/include/linux/scc.h b/include/linux/scc.h
index fbe189460..a896704e6 100644
--- a/include/linux/scc.h
+++ b/include/linux/scc.h
@@ -8,7 +8,7 @@
 /* selection of hardware types */
 
 #define PA0HZP		0x00	/* hardware type for PA0HZP SCC card and compatible */
-#define EAGLE         	0x01    /* hardware type for EAGLE card */
+#define EAGLE		0x01    /* hardware type for EAGLE card */
 #define PC100		0x02	/* hardware type for PC100 card */
 #define PRIMUS		0x04	/* hardware type for PRIMUS-PC (DG9BL) card */
 #define DRSI		0x08	/* hardware type for DRSI PC*Packet card */
@@ -28,10 +28,6 @@ enum SCC_ioctl_cmds {
 	SIOCSCCCAL
 };
 
-/* magic number */
-
-#define SCC_MAGIC	0x8530		/* ;-) */
-
 /* Device parameter control (from WAMPES) */
 
 enum L1_params {
@@ -218,7 +214,7 @@ struct scc_kiss {
 
 struct scc_channel {
 	int magic;			/* magic word */
-	
+
 	int init;			/* channel exists? */
 
 	struct net_device *dev;		/* link to device control structure */
@@ -226,12 +222,12 @@ struct scc_channel {
 
 	char brand;			/* manufacturer of the board */
 	long clock;			/* used clock */
-	
+
 	io_port ctrl;			/* I/O address of CONTROL register */
 	io_port	data;			/* I/O address of DATA register */
 	io_port special;		/* I/O address of special function port */
 	int irq;			/* Number of Interrupt */
-	
+
 	char option;
 	char enhanced;			/* Enhanced SCC support */
 
@@ -242,17 +238,15 @@ struct scc_channel {
         struct scc_kiss kiss;		/* control structure for KISS params */
         struct scc_stat stat;		/* statistical information */
         struct scc_modem modem; 	/* modem information */
-        
+
         struct sk_buff_head tx_queue;	/* next tx buffer */
         struct sk_buff *rx_buff;	/* pointer to frame currently received */
         struct sk_buff *tx_buff;	/* pointer to frame currently transmitted */
 
 	/* Timer */
-
 	struct timer_list tx_t;		/* tx timer for this channel */
 	struct timer_list tx_wdog;	/* tx watchdogs */
 };
 
-int scc_init(void);
 #endif /* defined(__KERNEL__) */
 #endif /* defined(_SCC_H) */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 4be0dd7d5..1e3dbe20f 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -136,6 +136,7 @@ struct sched_param {
  */
 extern rwlock_t tasklist_lock;
 extern spinlock_t runqueue_lock;
+extern spinlock_t mmlist_lock;
 
 extern void sched_init(void);
 extern void init_idle(void);
@@ -209,6 +210,9 @@ struct mm_struct {
 	int map_count;				/* number of VMAs */
 	struct semaphore mmap_sem;
 	spinlock_t page_table_lock;
+
+	struct list_head mmlist;		/* List of all active mm's */
+
 	unsigned long start_code, end_code, start_data, end_data;
 	unsigned long start_brk, brk, start_stack;
 	unsigned long arg_start, arg_end, env_start, env_end;
@@ -233,6 +237,7 @@ struct mm_struct {
 	map_count:	1, 				\
 	mmap_sem:	__MUTEX_INITIALIZER(name.mmap_sem), \
 	page_table_lock: SPIN_LOCK_UNLOCKED, 		\
+	mmlist:		LIST_HEAD_INIT(name.mmlist),	\
 }
 
 struct signal_struct {
diff --git a/include/linux/udf_fs.h b/include/linux/udf_fs.h
index c1a255da9..65c6a561a 100644
--- a/include/linux/udf_fs.h
+++ b/include/linux/udf_fs.h
@@ -45,15 +45,15 @@
 #ifdef UDFFS_DEBUG
 #define udf_debug(f, a...) \
 	{ \
-		printk (KERN_DEBUG "UDF-fs DEBUG (%s, %d): %s: ", \
+		printk (KERN_DEBUG "UDF-fs DEBUG %s:%d:%s: ", \
 			__FILE__, __LINE__, __FUNCTION__); \
-		printk (## f, ## a); \
+		printk (f, ##a); \
 	}
 #else
 #define udf_debug(f, a...) /**/
 #endif
 
 #define udf_info(f, a...) \
-		printk (KERN_INFO "UDF-fs INFO " ## f, ## a);
+		printk (KERN_INFO "UDF-fs INFO " f, ##a);
 
 #endif /* !defined(_LINUX_UDF_FS_H) */
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 39e9f2eed..5ca846eb1 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -315,7 +315,41 @@ struct usb_device;
  * Terminate the driver's table with an all-zeroes entry.
  * Init the fields you care about; zeroes are not used in comparisons.
  */
+#define USB_DEVICE_ID_MATCH_VENDOR		0x0001
+#define USB_DEVICE_ID_MATCH_PRODUCT		0x0002
+#define USB_DEVICE_ID_MATCH_DEV_LO		0x0004
+#define USB_DEVICE_ID_MATCH_DEV_HI		0x0008
+#define USB_DEVICE_ID_MATCH_DEV_CLASS		0x0010
+#define USB_DEVICE_ID_MATCH_DEV_SUBCLASS	0x0020
+#define USB_DEVICE_ID_MATCH_DEV_PROTOCOL	0x0040
+#define USB_DEVICE_ID_MATCH_INT_CLASS		0x0080
+#define USB_DEVICE_ID_MATCH_INT_SUBCLASS	0x0100
+#define USB_DEVICE_ID_MATCH_INT_PROTOCOL	0x0200
+
+#define USB_DEVICE_ID_MATCH_DEVICE		(USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT)
+#define USB_DEVICE_ID_MATCH_DEV_RANGE		(USB_DEVICE_ID_MATCH_DEV_LO | USB_DEVICE_ID_MATCH_DEV_HI)
+#define USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION	(USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_DEV_RANGE)
+#define USB_DEVICE_ID_MATCH_DEV_INFO \
+	(USB_DEVICE_ID_MATCH_DEV_CLASS | USB_DEVICE_ID_MATCH_DEV_SUBCLASS | USB_DEVICE_ID_MATCH_DEV_PROTOCOL)
+#define USB_DEVICE_ID_MATCH_INT_INFO \
+	(USB_DEVICE_ID_MATCH_INT_CLASS | USB_DEVICE_ID_MATCH_INT_SUBCLASS | USB_DEVICE_ID_MATCH_INT_PROTOCOL)
+
+/* Some useful macros */
+#define USB_DEVICE(vend,prod) \
+	match_flags: USB_DEVICE_ID_MATCH_DEVICE, idVendor: (vend), idProduct: (prod)
+#define USB_DEVICE_VER(vend,prod,lo,hi) \
+	match_flags: USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION, idVendor: (vend), idProduct: (prod), bcdDevice_lo: (lo), bcdDevice_hi: (hi)
+#define USB_DEVICE_INFO(cl,sc,pr) \
+	match_flags: USB_DEVICE_ID_MATCH_DEV_INFO, bDeviceClass: (cl), bDeviceSubClass: (sc), bDeviceProtocol: (pr)
+#define USB_INTERFACE_INFO(cl,sc,pr) \
+	match_flags: USB_DEVICE_ID_MATCH_INT_INFO, bInterfaceClass: (cl), bInterfaceSubClass: (sc), bInterfaceProtocol: (pr)
+
 struct usb_device_id {
+	/* This bitmask is used to determine which of the following fields
+	 * are to be used for matching.
+	 */
+	__u16		match_flags;
+
 	/*
 	 * vendor/product codes are checked, if vendor is nonzero
 	 * Range is for device revision (bcdDevice), inclusive;
diff --git a/include/linux/zorro_ids.h b/include/linux/zorro_ids.h
index 0a09d97bc..7e7490889 100644
--- a/include/linux/zorro_ids.h
+++ b/include/linux/zorro_ids.h
@@ -435,6 +435,7 @@
 /* unofficial ID */
 #define ZORRO_MANUF_INDIVIDUAL_COMPUTERS			0x1212
 #define  ZORRO_PROD_INDIVIDUAL_COMPUTERS_BUDDHA			ZORRO_ID(INDIVIDUAL_COMPUTERS, 0x00, 0)
+#define  ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF			ZORRO_ID(INDIVIDUAL_COMPUTERS, 0x17, 0)
 #define  ZORRO_PROD_INDIVIDUAL_COMPUTERS_CATWEASEL		ZORRO_ID(INDIVIDUAL_COMPUTERS, 0x2A, 0)
 
 #define ZORRO_MANUF_KUPKE_3					0x1248