v2.4.12.3 -> v2.4.12.4

  - Al Viro: mnt_list init
  - Jeff Garzik: network driver update (license tags, tulip driver)
  - David Miller: sparc, net updates
  - Ben Collins: firewire update
  - Gerd Knorr: btaudio/bttv update
  - Tim Hockin: MD cleanups
  - Greg KH, Petko Manolov: USB updates
  - Leonard Zubkoff: DAC960 driver update

9 files changed, 20 insertions, 8 deletions

diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h
index 481f324e36dd..cfcaa64f00fd 100644
--- a/include/asm-i386/system.h
+++ b/include/asm-i386/system.h
@@ -349,4 +349,6 @@ extern void __global_restore_flags(unsigned long);
 void disable_hlt(void);
 void enable_hlt(void);
 
+extern int is_sony_vaio_laptop;
+
 #endif
diff --git a/include/asm-i386/unistd.h b/include/asm-i386/unistd.h
index ebd216dd490d..36de103c240a 100644
--- a/include/asm-i386/unistd.h
+++ b/include/asm-i386/unistd.h
@@ -229,6 +229,7 @@
 #define __NR_fcntl64		221
 #define __NR_security		223	/* syscall for security modules */
 #define __NR_gettid		224
+#define __NR_readahead		225
 
 /* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
 
diff --git a/include/asm-sparc/highmem.h b/include/asm-sparc/highmem.h
index 9945bcb7e820..f50ecef0abda 100644
--- a/include/asm-sparc/highmem.h
+++ b/include/asm-sparc/highmem.h
@@ -111,14 +111,11 @@ static inline void *kmap_atomic(struct page *page, enum km_type type)
 
 static inline void kunmap_atomic(void *kvaddr, enum km_type type)
 {
-#if HIGHMEM_DEBUG
 	unsigned long vaddr = (unsigned long) kvaddr;
 	unsigned long idx = type + KM_TYPE_NR*smp_processor_id();
 
-#if 0
-	if (vaddr < FIXADDR_START) // FIXME
+	if (vaddr < FIX_KMAP_BEGIN) // FIXME
 		return;
-#endif
 
 	if (vaddr != FIX_KMAP_BEGIN + idx * PAGE_SIZE)
 		BUG();
@@ -130,6 +127,7 @@ static inline void kunmap_atomic(void *kvaddr, enum km_type type)
 	flush_cache_all();
 #endif
 
+#ifdef HIGHMEM_DEBUG
 	/*
 	 * force other mappings to Oops if they'll try to access
 	 * this pte without first remap it
diff --git a/include/asm-sparc64/cache.h b/include/asm-sparc64/cache.h
index 216b665f2d61..7fab7580e31a 100644
--- a/include/asm-sparc64/cache.h
+++ b/include/asm-sparc64/cache.h
@@ -9,7 +9,8 @@
 
 #define        L1_CACHE_ALIGN(x)       (((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1))
 
-#define        SMP_CACHE_BYTES		64 /* L2 cache line size. */
+#define        SMP_CACHE_BYTES_SHIFT	6
+#define        SMP_CACHE_BYTES		(1 << SMP_CACHE_BYTES_SHIFT) /* L2 cache line size. */
 
 #ifdef MODULE
 #define __cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
diff --git a/include/asm-sparc64/hardirq.h b/include/asm-sparc64/hardirq.h
index 1be21d47143d..62bfae557ad0 100644
--- a/include/asm-sparc64/hardirq.h
+++ b/include/asm-sparc64/hardirq.h
@@ -12,6 +12,7 @@
 #include <linux/spinlock.h>
 
 /* entry.S is sensitive to the offsets of these fields */
+/* rtrap.S is sensitive to the size of this structure */
 typedef struct {
 	unsigned int __softirq_pending;
 	unsigned int __unused_1;
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 8f4f261eebca..bac34263ade0 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -53,7 +53,10 @@ struct ethtool_wolinfo {
 #define ETHTOOL_GDRVINFO	0x00000003 /* Get driver info. */
 #define ETHTOOL_GREGS		0x00000004 /* Get NIC registers, privileged. */
 #define ETHTOOL_GWOL		0x00000005 /* Get wake-on-lan options. */
-#define ETHTOOL_SWOL		0x00000006 /* Set wake-on-lan options. */
+#define ETHTOOL_SWOL		0x00000006 /* Set wake-on-lan options, priv. */
+#define ETHTOOL_GMSGLVL		0x00000007 /* Get driver message level */
+#define ETHTOOL_SMSGLVL		0x00000008 /* Set driver msg level, priv. */
+#define ETHTOOL_NWAY_RST	0X00000009 /* Restart autonegotiation, priv. */
 
 /* compatibility with older code */
 #define SPARC_ETH_GSET		ETHTOOL_GSET
@@ -71,6 +74,7 @@ struct ethtool_wolinfo {
 #define SUPPORTED_AUI			(1 << 8)
 #define SUPPORTED_MII			(1 << 9)
 #define SUPPORTED_FIBRE			(1 << 10)
+#define SUPPORTED_10base2		(1 << 11)
 
 /* Indicates what features are advertised by the interface. */
 #define ADVERTISED_10baseT_Half		(1 << 0)
@@ -84,6 +88,7 @@ struct ethtool_wolinfo {
 #define ADVERTISED_AUI			(1 << 8)
 #define ADVERTISED_MII			(1 << 9)
 #define ADVERTISED_FIBRE		(1 << 10)
+#define ADVERTISED_10base2		(1 << 11)
 
 /* The following are all involved in forcing a particular link
  * mode for the device for setting things.  When getting the
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index f39bcabdf7c0..383d72b35ed8 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1604,6 +1604,7 @@
 #define PCI_DEVICE_ID_INTEL_82801CA_10	0x248a
 #define PCI_DEVICE_ID_INTEL_82801CA_11	0x248b
 #define PCI_DEVICE_ID_INTEL_82801CA_12	0x248c
+#define PCI_DEVICE_ID_INTEL_80310	0x530d
 #define PCI_DEVICE_ID_INTEL_82810_MC1	0x7120
 #define PCI_DEVICE_ID_INTEL_82810_IG1	0x7121
 #define PCI_DEVICE_ID_INTEL_82810_MC3	0x7122
diff --git a/include/linux/swap.h b/include/linux/swap.h
index fd148822857f..e8268cb67b74 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -110,7 +110,7 @@ extern void swap_setup(void);
 
 /* linux/mm/vmscan.c */
 extern wait_queue_head_t kswapd_wait;
-extern int FASTCALL(try_to_free_pages(zone_t *, unsigned int, unsigned int));
+extern int FASTCALL(try_to_free_pages(unsigned int, unsigned int));
 
 /* linux/mm/page_io.c */
 extern void rw_swap_page(int, struct page *);
diff --git a/include/net/route.h b/include/net/route.h
index 887237f6439c..f35af5807444 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -37,9 +37,12 @@
 #endif
 
 #define RTO_ONLINK	0x01
-#define RTO_TPROXY	0x80000000
 
 #define RTO_CONN	0
+/* RTO_CONN is not used (being alias for 0), but preserved not to break
+ * some modules referring to it. */
+
+#define RT_CONN_FLAGS(sk)   (RT_TOS(sk->protinfo.af_inet.tos) | sk->localroute)
 
 struct rt_key
 {