v2.4.2 -> v2.4.2.1

  - Chris Mason: reiserfs, another null bytes bug
  - Andrea Arkangeli: make SMP Athlon build
  - Alexander Zarochentcev: reiserfs directory fsync SMP locking fix
  - Jeff Garzik: PCI network driver updates
  - Alan Cox: continue merging
  - Ingo Molnar: fix RAID AUTORUN ioctl, scheduling improvements

24 files changed, 54 insertions, 33 deletions

diff --git a/include/asm-alpha/io.h b/include/asm-alpha/io.h
index ddbdedfa2380..3d2b51596c64 100644
--- a/include/asm-alpha/io.h
+++ b/include/asm-alpha/io.h
@@ -455,6 +455,23 @@ out:
 #define isa_memcpy_fromio(a,b,c)	memcpy_fromio((a),__ioremap(b),(c))
 #define isa_memcpy_toio(a,b,c)		memcpy_toio(__ioremap(a),(b),(c))
 
+static inline int
+isa_check_signature(unsigned long io_addr, const unsigned char *signature,
+		int length)
+{
+	int retval = 0;
+	do {
+		if (isa_readb(io_addr) != *signature)
+			goto out;
+		io_addr++;
+		signature++;
+		length--;
+	} while (length);
+	retval = 1;
+out:
+	return retval;
+}
+
 
 /*
  * The Alpha Jensen hardware for some rather strange reason puts
diff --git a/include/asm-alpha/machvec.h b/include/asm-alpha/machvec.h
index 0aad19668488..ed340a2473bf 100644
--- a/include/asm-alpha/machvec.h
+++ b/include/asm-alpha/machvec.h
@@ -21,7 +21,7 @@ struct vm_area_struct;
 struct linux_hose_info;
 struct pci_dev;
 struct pci_ops;
-struct pci_controler;
+struct pci_controller;
 
 struct alpha_machine_vector
 {
@@ -40,7 +40,7 @@ struct alpha_machine_vector
 	unsigned long min_io_address;
 	unsigned long min_mem_address;
 
-	void (*mv_pci_tbi)(struct pci_controler *hose,
+	void (*mv_pci_tbi)(struct pci_controller *hose,
 			   dma_addr_t start, dma_addr_t end);
 
 	unsigned int (*mv_inb)(unsigned long);
diff --git a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h
index 85923e999eaa..781a4882bc2e 100644
--- a/include/asm-alpha/pci.h
+++ b/include/asm-alpha/pci.h
@@ -16,10 +16,10 @@ struct pci_bus;
 struct resource;
 struct pci_iommu_arena;
 
-/* A controler.  Used to manage multiple PCI busses.  */
+/* A controller.  Used to manage multiple PCI busses.  */
 
-struct pci_controler {
-	struct pci_controler *next;
+struct pci_controller {
+	struct pci_controller *next;
         struct pci_bus *bus;
 	struct resource *io_space;
 	struct resource *mem_space;
diff --git a/include/asm-alpha/semaphore.h b/include/asm-alpha/semaphore.h
index 0e4a1e3a678f..c2a511ea41cc 100644
--- a/include/asm-alpha/semaphore.h
+++ b/include/asm-alpha/semaphore.h
@@ -12,6 +12,7 @@
 #include <asm/system.h>
 #include <asm/atomic.h>
 #include <asm/compiler.h>	/* __builtin_expect */
+#include <linux/wait.h>
 
 #define DEBUG_SEMAPHORE 0
 #define DEBUG_RW_SEMAPHORE 0
diff --git a/include/asm-alpha/smp.h b/include/asm-alpha/smp.h
index f11e254f6719..2cc52a7e0578 100644
--- a/include/asm-alpha/smp.h
+++ b/include/asm-alpha/smp.h
@@ -57,6 +57,7 @@ extern int __cpu_logical_map[NR_CPUS];
 #define smp_processor_id()	(current->processor)
 
 extern unsigned long cpu_present_mask;
+#define cpu_online_map cpu_present_mask
 
 #endif /* CONFIG_SMP */
 
diff --git a/include/asm-arm/arch-sa1100/irq.h b/include/asm-arm/arch-sa1100/irq.h
index 91bca91d8564..8c3105066f31 100644
--- a/include/asm-arm/arch-sa1100/irq.h
+++ b/include/asm-arm/arch-sa1100/irq.h
@@ -134,7 +134,7 @@ static void sa1100_unmask_GPIO11_27_irq(unsigned int irq)
 	int mask = (1 << GPIO_11_27_IRQ(irq));
 	if (GPIO_11_27_spurious & mask) {
 		/* 
-		 * We don't want to miss an interrupt that would have occured
+		 * We don't want to miss an interrupt that would have occurred
 		 * while it was masked.  Simulate it if it is the case.
 		 */
 		int state = GPLR;
diff --git a/include/asm-i386/string-486.h b/include/asm-i386/string-486.h
index 06022132cb50..51bfd051bc00 100644
--- a/include/asm-i386/string-486.h
+++ b/include/asm-i386/string-486.h
@@ -352,11 +352,6 @@ return (to);
 
 #ifdef CONFIG_X86_USE_3DNOW
 
-#include <linux/spinlock.h>
-#include <asm/system.h>
-#include <asm/ptrace.h>
-#include <linux/smp.h>
-#include <linux/interrupt.h>
 #include <asm/mmx.h>
 
 /*
@@ -365,14 +360,14 @@ return (to);
 
 static inline void * __constant_memcpy3d(void * to, const void * from, size_t len)
 {
-	if(len<512 || in_interrupt())
+	if (len < 512)
 		return __memcpy_c(to, from, len);
 	return _mmx_memcpy(to, from, len);
 }
 
 static inline void *__memcpy3d(void *to, const void *from, size_t len)
 {
-	if(len<512 || in_interrupt())
+	if(len < 512)
 		return __memcpy_g(to, from, len);
 	return _mmx_memcpy(to, from, len);
 }
diff --git a/include/asm-i386/string.h b/include/asm-i386/string.h
index 62bf7916c1e6..6c55845439de 100644
--- a/include/asm-i386/string.h
+++ b/include/asm-i386/string.h
@@ -287,13 +287,6 @@ __asm__ __volatile__( \
 
 #ifdef CONFIG_X86_USE_3DNOW
 
-/* All this just for in_interrupt() ... */
-
-#include <asm/system.h>
-#include <asm/ptrace.h>
-#include <linux/smp.h>
-#include <linux/spinlock.h>
-#include <linux/interrupt.h>
 #include <asm/mmx.h>
 
 /*
@@ -302,14 +295,14 @@ __asm__ __volatile__( \
 
 static inline void * __constant_memcpy3d(void * to, const void * from, size_t len)
 {
-	if(len<512 || in_interrupt())
+	if (len < 512)
 		return __constant_memcpy(to, from, len);
 	return _mmx_memcpy(to, from, len);
 }
 
 extern __inline__ void *__memcpy3d(void *to, const void *from, size_t len)
 {
-	if(len<512 || in_interrupt())
+	if (len < 512)
 		return __memcpy(to, from, len);
 	return _mmx_memcpy(to, from, len);
 }
diff --git a/include/asm-mips64/smp.h b/include/asm-mips64/smp.h
index b8a8f8d754a9..500731708188 100644
--- a/include/asm-mips64/smp.h
+++ b/include/asm-mips64/smp.h
@@ -40,6 +40,7 @@ extern int __cpu_logical_map[NR_CPUS];
 
 /* Good enough for toy^Wupto 64 CPU Origins.  */
 extern unsigned long cpu_present_mask;
+#define cpu_online_map cpu_present_mask
 
 #endif
 
diff --git a/include/asm-s390/ccwcache.h b/include/asm-s390/ccwcache.h
index cfbb03bf2974..fd5efa10d112 100644
--- a/include/asm-s390/ccwcache.h
+++ b/include/asm-s390/ccwcache.h
@@ -59,7 +59,7 @@ typedef struct ccw_req_t {
 #define CQR_STATUS_FILLED   0x01	/* request is ready to be preocessed */
 #define CQR_STATUS_QUEUED   0x02	/* request is queued to be processed */
 #define CQR_STATUS_IN_IO    0x03	/* request is currently in IO */
-#define CQR_STATUS_DONE     0x04	/* request is completed sucessfully */
+#define CQR_STATUS_DONE     0x04	/* request is completed successfully */
 #define CQR_STATUS_ERROR    0x05	/* request is completed with error */
 #define CQR_STATUS_FAILED   0x06	/* request is finally failed */
 
diff --git a/include/asm-s390/lowcore.h b/include/asm-s390/lowcore.h
index cdfa00fa244b..59dfe5698f15 100644
--- a/include/asm-s390/lowcore.h
+++ b/include/asm-s390/lowcore.h
@@ -124,7 +124,7 @@ struct _lowcore
         __u8         pad3[0xD8-0xC4];          /* 0x0c4 */
 	__u32        cpu_timer_save_area[2];   /* 0x0d8 */
 	__u32        clock_comp_save_area[2];  /* 0x0e0 */
-	__u32        mcck_interuption_code[2]; /* 0x0e8 */
+	__u32        mcck_interruption_code[2]; /* 0x0e8 */
 	__u8         pad4[0xf4-0xf0];          /* 0x0f0 */
 	__u32        external_damage_code;     /* 0x0f4 */
 	__u32        failing_storage_address;  /* 0x0f8 */
diff --git a/include/asm-s390x/ccwcache.h b/include/asm-s390x/ccwcache.h
index cfbb03bf2974..fd5efa10d112 100644
--- a/include/asm-s390x/ccwcache.h
+++ b/include/asm-s390x/ccwcache.h
@@ -59,7 +59,7 @@ typedef struct ccw_req_t {
 #define CQR_STATUS_FILLED   0x01	/* request is ready to be preocessed */
 #define CQR_STATUS_QUEUED   0x02	/* request is queued to be processed */
 #define CQR_STATUS_IN_IO    0x03	/* request is currently in IO */
-#define CQR_STATUS_DONE     0x04	/* request is completed sucessfully */
+#define CQR_STATUS_DONE     0x04	/* request is completed successfully */
 #define CQR_STATUS_ERROR    0x05	/* request is completed with error */
 #define CQR_STATUS_FAILED   0x06	/* request is finally failed */
 
diff --git a/include/asm-s390x/dasd.h b/include/asm-s390x/dasd.h
index d9e4a836396d..ea5e43eae256 100644
--- a/include/asm-s390x/dasd.h
+++ b/include/asm-s390x/dasd.h
@@ -203,7 +203,7 @@ struct request;
 typedef ccw_req_t *(*dasd_erp_action_fn_t) (ccw_req_t * cqr);
 typedef ccw_req_t *(*dasd_erp_postaction_fn_t) (ccw_req_t * cqr);
 
-typedef int (*dasd_ck_id_fn_t) (dev_info_t *);
+typedef int (*dasd_ck_id_fn_t) (s390_dev_info_t *);
 typedef int (*dasd_ck_characteristics_fn_t) (struct dasd_device_t *);
 typedef int (*dasd_fill_geometry_fn_t) (struct dasd_device_t *, struct hd_geometry *);
 typedef ccw_req_t *(*dasd_format_fn_t) (struct dasd_device_t *, struct format_data_t *);
@@ -269,7 +269,7 @@ typedef struct dasd_profile_info_t {
 } dasd_profile_info_t;
 
 typedef struct dasd_device_t {
-	dev_info_t devinfo;
+	s390_dev_info_t devinfo;
 	dasd_discipline_t *discipline;
 	int level;
         int open_count;
diff --git a/include/asm-s390x/lowcore.h b/include/asm-s390x/lowcore.h
index 215b8b8e0767..fe03e63516f4 100644
--- a/include/asm-s390x/lowcore.h
+++ b/include/asm-s390x/lowcore.h
@@ -116,7 +116,7 @@ struct _lowcore
 	__u8         pad3[0xc8-0xc4];          /* 0x0c4 */
 	__u32        stfl_fac_list;            /* 0x0c8 */
 	__u8         pad4[0xe8-0xcc];          /* 0x0cc */
-	__u32        mcck_interuption_code[2]; /* 0x0e8 */
+	__u32        mcck_interruption_code[2]; /* 0x0e8 */
 	__u8         pad5[0xf4-0xf0];          /* 0x0f0 */
 	__u32        external_damage_code;     /* 0x0f4 */
 	addr_t       failing_storage_address;  /* 0x0f8 */
diff --git a/include/asm-s390x/socket.h b/include/asm-s390x/socket.h
index 0d00c3b54949..e78379203e34 100644
--- a/include/asm-s390x/socket.h
+++ b/include/asm-s390x/socket.h
@@ -50,6 +50,7 @@
 #define SO_PEERNAME		28
 #define SO_TIMESTAMP		29
 #define SCM_TIMESTAMP		SO_TIMESTAMP
+#define SO_ACCEPTCONN  		30
 
 /* Nast libc5 fixup - bletch */
 #if defined(__KERNEL__)
diff --git a/include/asm-s390x/unistd.h b/include/asm-s390x/unistd.h
index 1ac8474ee5ac..090fe68de56d 100644
--- a/include/asm-s390x/unistd.h
+++ b/include/asm-s390x/unistd.h
@@ -330,7 +330,6 @@ static inline _syscall1(int,_exit,int,exitcode)
 static inline _syscall1(int,delete_module,const char *,name)
 static inline _syscall2(long,stat,char *,filename,struct stat *,statbuf)
 
-extern int sys_wait4(int, int *, int, struct rusage *);
 static inline pid_t waitpid(int pid, int * wait_stat, int flags)
 {
         return sys_wait4(pid, wait_stat, flags, NULL);
diff --git a/include/asm-sparc/smp.h b/include/asm-sparc/smp.h
index f6504165d03f..31507b7bc624 100644
--- a/include/asm-sparc/smp.h
+++ b/include/asm-sparc/smp.h
@@ -51,6 +51,7 @@ extern unsigned long cpu_offset[NR_CPUS];
 extern int smp_found_cpus;
 extern unsigned char boot_cpu_id;
 extern unsigned long cpu_present_map;
+#define cpu_online_map cpu_present_map
 
 typedef void (*smpfunc_t)(unsigned long, unsigned long, unsigned long,
 		       unsigned long, unsigned long);
diff --git a/include/asm-sparc64/smp.h b/include/asm-sparc64/smp.h
index 3898efdd2e9f..3fb3886b0cd8 100644
--- a/include/asm-sparc64/smp.h
+++ b/include/asm-sparc64/smp.h
@@ -60,6 +60,7 @@ extern struct cpuinfo_sparc cpu_data[NR_CPUS];
  
 extern unsigned char boot_cpu_id;
 extern unsigned long cpu_present_map;
+#define cpu_online_map cpu_present_map
 
 /*
  *	General functions that each host system must provide.
diff --git a/include/linux/fs.h b/include/linux/fs.h
index a5f4cddafaaf..2a51264b34fc 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -244,7 +244,7 @@ struct buffer_head {
 	struct buffer_head *b_reqnext;	/* request queue */
 
 	struct buffer_head **b_pprev;	/* doubly linked list of hash-queue */
-	char * b_data;			/* pointer to data block (512 byte) */
+	char * b_data;			/* pointer to data block */
 	struct page *b_page;		/* the page this bh is mapped to */
 	void (*b_end_io)(struct buffer_head *bh, int uptodate); /* I/O completion */
  	void *b_private;		/* reserved for b_end_io */
@@ -504,6 +504,8 @@ extern spinlock_t files_lock;
 
 extern int init_private_file(struct file *, struct dentry *, int);
 
+#define	MAX_NON_LFS	((1UL<<31) - 1)
+
 #define FL_POSIX	1
 #define FL_FLOCK	2
 #define FL_BROKEN	4	/* broken flock() emulation */
@@ -651,6 +653,7 @@ struct super_block {
 	unsigned char		s_blocksize_bits;
 	unsigned char		s_lock;
 	unsigned char		s_dirt;
+	unsigned long long	s_maxbytes;	/* Max file size */
 	struct file_system_type	*s_type;
 	struct super_operations	*s_op;
 	struct dquot_operations	*dq_op;
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 6cfe0bbb78c5..eaa63807af94 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -223,6 +223,11 @@ struct unixware_disklabel {
 
 #endif /* CONFIG_UNIXWARE_DISKLABEL */
 
+#ifdef CONFIG_MINIX_SUBPARTITION
+#   define MINIX_PARTITION         0x81  /* Minix Partition ID */
+#   define MINIX_NR_SUBPARTITIONS  4
+#endif /* CONFIG_MINIX_SUBPARTITION */
+
 #ifdef __KERNEL__
 extern struct gendisk *gendisk_head;	/* linked list of disks */
 
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 462091674065..420ea0cc51f3 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -630,7 +630,6 @@ extern void		fddi_setup(struct net_device *dev);
 extern void		tr_setup(struct net_device *dev);
 extern void		fc_setup(struct net_device *dev);
 extern void		fc_freedev(struct net_device *dev);
-extern int		ether_config(struct net_device *dev, struct ifmap *map);
 /* Support for loadable net-drivers */
 extern int		register_netdev(struct net_device *dev);
 extern void		unregister_netdev(struct net_device *dev);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 205abe61e428..715113f26d66 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -539,6 +539,9 @@ void pdev_sort_resources(struct pci_dev *, struct resource_list *, u32);
 unsigned long pci_bridge_check_io(struct pci_dev *);
 void pci_fixup_irqs(u8 (*)(struct pci_dev *, u8 *),
 		    int (*)(struct pci_dev *, u8, u8));
+#define HAVE_PCI_REQ_REGIONS 1
+int pci_request_regions(struct pci_dev *, char *);
+void pci_release_regions(struct pci_dev *);
 
 /* New-style probing supporting hot-pluggable devices */
 int pci_register_driver(struct pci_driver *);
diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 7a73db598fa6..d10f7a5c0382 100644
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -6,13 +6,12 @@
 
 #ifdef __KERNEL__
 
-#if LINUX_VERSION_CODE >= 0x020100
 #include <linux/poll.h>
-#endif
 #include <linux/devfs_fs_kernel.h>
 
 struct video_device
 {
+	struct module *owner;
 	char name[32];
 	int type;
 	int hardware;
diff --git a/include/pcmcia/ciscode.h b/include/pcmcia/ciscode.h
index 7fd7da26d035..2e0a838f17ce 100644
--- a/include/pcmcia/ciscode.h
+++ b/include/pcmcia/ciscode.h
@@ -112,10 +112,12 @@
 #define PRODID_SOCKET_DUAL_RS232	0x0006
 #define PRODID_SOCKET_EIO		0x000a
 #define PRODID_SOCKET_LPE		0x000d
+#define PRODID_SOCKET_LPE_CF		0x0075
 
 #define MANFID_SUNDISK			0x0045
 
 #define MANFID_TDK			0x0105
+#define PRODID_TDK_CF010		0x0900
 
 #define MANFID_TOSHIBA			0x0098