Merge mandrakesoft.com:/home/jgarzik/vanilla/linus-2.5

into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5

9 files changed, 36 insertions, 10 deletions

diff --git a/include/linux/adfs_fs.h b/include/linux/adfs_fs.h
index 5c29f4982087..bebb2a0c5254 100644
--- a/include/linux/adfs_fs.h
+++ b/include/linux/adfs_fs.h
@@ -42,6 +42,7 @@ struct adfs_discrecord {
 
 #ifdef __KERNEL__
 #include <linux/adfs_fs_i.h>
+#include <linux/adfs_fs_sb.h>
 /*
  * Calculate the boot block checksum on an ADFS drive.  Note that this will
  * appear to be correct if the sector contains all zeros, so also check that
@@ -60,6 +61,11 @@ static inline int adfs_checkbblk(unsigned char *ptr)
 	return (result & 0xff) != ptr[511];
 }
 
+static inline struct adfs_sb_info *ADFS_SB(struct super_block *sb)
+{
+	return sb->u.generic_sbp;
+}
+
 static inline struct adfs_inode_info *ADFS_I(struct inode *inode)
 {
 	return list_entry(inode, struct adfs_inode_info, vfs_inode);
diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h
index c1fb2ad9fcb4..7864372bc2b6 100644
--- a/include/linux/agp_backend.h
+++ b/include/linux/agp_backend.h
@@ -48,6 +48,7 @@ enum chipset_type {
 	INTEL_I815,
 	INTEL_I820,
 	INTEL_I830_M,
+	INTEL_I845_G,
 	INTEL_I840,
 	INTEL_I845,
 	INTEL_I850,
diff --git a/include/linux/atapi.h b/include/linux/atapi.h
index 3a2fa93cc6c0..029ae2b6633a 100644
--- a/include/linux/atapi.h
+++ b/include/linux/atapi.h
@@ -20,6 +20,19 @@
 #define IDEFLOPPY_PC_BUFFER_SIZE	256
 #define IDETAPE_PC_BUFFER_SIZE		256
 
+/*
+ * Packet flags bits.
+ */
+
+#define	PC_ABORT		0	/* set when an error is considered normal - we won't retry */
+#define PC_WAIT_FOR_DSC		1	/* 1 when polling for DSC on a media access command */
+#define PC_DMA_RECOMMENDED	2	/* 1 when we prefer to use DMA if possible */
+#define	PC_DMA_IN_PROGRESS	3	/* 1 while DMA in progress */
+#define	PC_DMA_ERROR		4	/* 1 when encountered problem during DMA */
+#define	PC_WRITING		5	/* data direction */
+#define	PC_SUPPRESS_ERROR	6	/* suppress error reporting */
+#define PC_TRANSFORM		7	/* transform SCSI commands */
+
 /* This struct get's shared between different drivers.
  */
 struct atapi_packet_command {
diff --git a/include/linux/device.h b/include/linux/device.h
index dd88f8b7cace..2186f85a8beb 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -48,11 +48,6 @@ enum {
 	RESUME_ENABLE,
 };
 
-enum {
-	REMOVE_NOTIFY,
-	REMOVE_FREE_RESOURCES,
-};
-
 struct device;
 struct device_driver;
 
@@ -103,7 +98,7 @@ struct device_driver {
 	struct driver_dir_entry	dir;
 
 	int	(*probe)	(struct device * dev);
-	int 	(*remove)	(struct device * dev, u32 flags);
+	int 	(*remove)	(struct device * dev);
 
 	int	(*suspend)	(struct device * dev, u32 state, u32 level);
 	int	(*resume)	(struct device * dev, u32 level);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 7105142542c9..31a691491a9f 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -625,7 +625,6 @@ extern void __kill_fasync(struct fasync_struct *, int, int);
 #include <linux/hpfs_fs_sb.h>
 #include <linux/ufs_fs_sb.h>
 #include <linux/romfs_fs_sb.h>
-#include <linux/adfs_fs_sb.h>
 
 extern struct list_head super_blocks;
 extern spinlock_t sb_lock;
@@ -671,7 +670,6 @@ struct super_block {
 		struct hpfs_sb_info	hpfs_sb;
 		struct ufs_sb_info	ufs_sb;
 		struct romfs_sb_info	romfs_sb;
-		struct adfs_sb_info	adfs_sb;
 		void			*generic_sbp;
 	} u;
 	/*
diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index 556b847804ca..eae4f5bbb65a 100644
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -20,6 +20,12 @@
 #define NBD_SET_SIZE_BLOCKS	_IO( 0xab, 7 )
 #define NBD_DISCONNECT  _IO( 0xab, 8 )
 
+enum {
+	NBD_CMD_READ = 0,
+	NBD_CMD_WRITE = 1,
+	NBD_CMD_DISC = 2
+};
+
 #ifdef MAJOR_NR
 
 #include <asm/semaphore.h>
@@ -33,6 +39,8 @@ extern int requests_in;
 extern int requests_out;
 #endif
 
+#define nbd_cmd(req) ((req)->cmd[0])
+
 static void
 nbd_end_request(struct request *req)
 {
@@ -68,6 +76,7 @@ struct nbd_device {
 	struct socket * sock;
 	struct file * file; 		/* If == NULL, device is not ready, yet	*/
 	int magic;			/* FIXME: not if debugging is off	*/
+	spinlock_t queue_lock;
 	struct list_head queue_head;	/* Requests are added here...			*/
 	struct semaphore tx_lock;
 };
diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
index 16fadad4d92f..d6a7928a2866 100644
--- a/include/linux/pipe_fs_i.h
+++ b/include/linux/pipe_fs_i.h
@@ -13,6 +13,8 @@ struct pipe_inode_info {
 	unsigned int waiting_writers;
 	unsigned int r_counter;
 	unsigned int w_counter;
+	struct fasync_struct *fasync_readers;
+	struct fasync_struct *fasync_writers;
 };
 
 /* Differs from PIPE_BUF in that PIPE_SIZE is the length of the actual
@@ -30,6 +32,8 @@ struct pipe_inode_info {
 #define PIPE_WAITING_WRITERS(inode)	((inode).i_pipe->waiting_writers)
 #define PIPE_RCOUNTER(inode)	((inode).i_pipe->r_counter)
 #define PIPE_WCOUNTER(inode)	((inode).i_pipe->w_counter)
+#define PIPE_FASYNC_READERS(inode)     (&((inode).i_pipe->fasync_readers))
+#define PIPE_FASYNC_WRITERS(inode)     (&((inode).i_pipe->fasync_writers))
 
 #define PIPE_EMPTY(inode)	(PIPE_LEN(inode) == 0)
 #define PIPE_FULL(inode)	(PIPE_LEN(inode) == PIPE_SIZE)
diff --git a/include/linux/udf_fs.h b/include/linux/udf_fs.h
index 07cbb273974f..83eddc46650f 100644
--- a/include/linux/udf_fs.h
+++ b/include/linux/udf_fs.h
@@ -36,8 +36,6 @@
 
 #include <linux/config.h>
 
-#include <linux/config.h>
-
 #define UDF_PREALLOCATE
 #define UDF_DEFAULT_PREALLOC_BLOCKS	8
 
diff --git a/include/linux/usb.h b/include/linux/usb.h
index df2c764dec66..d31eb7e942b3 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -713,6 +713,8 @@ struct usb_driver {
 	/* void (*resume)(struct usb_device *dev); */
 };
 
+extern struct bus_type usb_bus_type;
+
 /*
  * use these in module_init()/module_exit()
  * and don't forget MODULE_DEVICE_TABLE(usb, ...)