v2.4.9.15 -> v2.4.10

  - Andrew Grover: ACPI update
  - Al Viro: block devices..
  - Andrea Arcangeli: fix list manipulation bogosity
  - Trond Myklebust: 64-bit file locking fixes
  - Brad Hards: USB CDC ethernet
  - Chris Mason: reiserfs speedup
  - Robert Love: re-merge AMD 761 GART support that was lost in -ac merge
  - Adam Richter: check pci_module_init() return value

4 files changed, 48 insertions, 8 deletions

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index e5c3d786b862..216200305f3e 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -28,20 +28,24 @@
 #include <linux/wait.h>
 #endif /* __KERNEL__ */
 
-typedef int acpi_sstate_t;
-
 /*
  * Device states
  */
-enum
-{
+typedef enum {
 	ACPI_D0, /* fully-on */
 	ACPI_D1, /* partial-on */
 	ACPI_D2, /* partial-on */
 	ACPI_D3, /* fully-off */
-};
+} acpi_dstate_t;
 
-typedef int acpi_dstate_t;
+typedef enum {
+	ACPI_S0, /* working state */
+	ACPI_S1, /* power-on suspend */
+	ACPI_S2, /* suspend to ram, with devices */
+	ACPI_S3, /* suspend to ram */
+	ACPI_S4, /* suspend to disk */
+	ACPI_S5, /* soft-off */
+} acpi_sstate_t;
 
 /* RSDP location */
 #define ACPI_BIOS_ROM_BASE (0x0e0000)
@@ -160,4 +164,17 @@ enum
 
 #define ACPI_SLP_TYP_DISABLED	(~0UL)
 
+#ifdef __KERNEL__
+
+/* routines for saving/restoring kernel state */
+FASTCALL(extern unsigned long acpi_save_state_mem(unsigned long return_point));
+FASTCALL(extern int acpi_save_state_disk(unsigned long return_point));
+extern void acpi_restore_state(void);
+
+extern unsigned long acpi_wakeup_address;
+
+#endif /* __KERNEL__ */
+
+int acpi_init(void);
+
 #endif /* _LINUX_ACPI_H */
diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h
index e29bba623289..eadb9e6ae056 100644
--- a/include/linux/agp_backend.h
+++ b/include/linux/agp_backend.h
@@ -59,6 +59,7 @@ enum chipset_type {
 	AMD_GENERIC,
 	AMD_IRONGATE,
 	AMD_761,
+	AMD_762,
 	ALI_M1541,
 	ALI_M1621,
 	ALI_M1631,
diff --git a/include/linux/fcntl.h b/include/linux/fcntl.h
index bdcf78b74c3b..704fb76b6334 100644
--- a/include/linux/fcntl.h
+++ b/include/linux/fcntl.h
@@ -23,4 +23,28 @@
 #define DN_ATTRIB	0x00000020	/* File changed attibutes */
 #define DN_MULTISHOT	0x80000000	/* Don't remove notifier */
 
+#ifdef __KERNEL__
+
+#if BITS_PER_LONG == 32
+#define IS_GETLK32(cmd)		((cmd) == F_GETLK)
+#define IS_SETLK32(cmd)		((cmd) == F_SETLK)
+#define IS_SETLKW32(cmd)	((cmd) == F_SETLKW)
+#define IS_GETLK64(cmd)		((cmd) == F_GETLK64)
+#define IS_SETLK64(cmd)		((cmd) == F_SETLK64)
+#define IS_SETLKW64(cmd)	((cmd) == F_SETLKW64)
+#else
+#define IS_GETLK32(cmd)		(0)
+#define IS_SETLK32(cmd)		(0)
+#define IS_SETLKW32(cmd)	(0)
+#define IS_GETLK64(cmd)		((cmd) == F_GETLK)
+#define IS_SETLK64(cmd)		((cmd) == F_SETLK)
+#define IS_SETLKW64(cmd)	((cmd) == F_SETLKW)
+#endif /* BITS_PER_LONG == 32 */
+
+#define IS_GETLK(cmd)	(IS_GETLK32(cmd)  || IS_GETLK64(cmd))
+#define IS_SETLK(cmd)	(IS_SETLK32(cmd)  || IS_SETLK64(cmd))
+#define IS_SETLKW(cmd)	(IS_SETLKW32(cmd) || IS_SETLKW64(cmd))
+
+#endif /* __KERNEL__ */
+
 #endif
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 9eca17f8ee1b..1600704891a6 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -412,7 +412,6 @@ struct block_device {
 	struct inode *		bd_inode;
 	dev_t			bd_dev;  /* not a kdev_t - it's a search key */
 	int			bd_openers;
-	int			bd_cache_openers;
 	const struct block_device_operations *bd_op;
 	struct semaphore	bd_sem;	/* open/close mutex */
 	struct list_head	bd_inodes;
@@ -450,7 +449,6 @@ struct inode {
 	struct file_lock	*i_flock;
 	struct address_space	*i_mapping;
 	struct address_space	i_data;
-	int			i_mapping_overload;
 	struct dquot		*i_dquot[MAXQUOTAS];
 	/* These three should probably be a union */
 	struct list_head	i_devices;