v2.4.14.6 -> v2.4.14.7

  - Jeff Garzik: network driver updates
  - Christoph Hellwig: UFS filesystem byteorder cleanups
  - me: modified Andrea VM page allocator tuning

5 files changed, 18 insertions, 19 deletions

diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index b1f8185eb47c..9b65fe1187dc 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -36,8 +36,9 @@ struct ethtool_drvinfo {
 	char	bus_info[ETHTOOL_BUSINFO_LEN];	/* Bus info for this IF. */
 				/* For PCI devices, use pci_dev->slot_name. */
 	char	reserved1[32];
-	char	reserved2[28];
-	u32	regdump_len;	/* Amount of data from ETHTOOL_GREGS (u32s) */
+	char	reserved2[24];
+	u32	eedump_len;	/* Size of data from ETHTOOL_GEEPROM (bytes) */
+	u32	regdump_len;	/* Size of data from ETHTOOL_GREGS (bytes) */
 };
 
 #define SOPASS_MAX	6
@@ -59,10 +60,18 @@ struct ethtool_value {
 struct ethtool_regs {
 	u32	cmd;
 	u32	version; /* driver-specific, indicates different chips/revs */
-	u32	len; /* in u32 increments */
-	u32	data[0];
+	u32	len; /* bytes */
+	u8	data[0];
 };
 
+/* for passing EEPROM chunks */
+struct ethtool_eeprom {
+	u32	cmd;
+	u32	magic;
+	u32	offset; /* in bytes */
+	u32	len; /* in bytes */
+	u8	data[0];
+};
 /* CMDs currently supported */
 #define ETHTOOL_GSET		0x00000001 /* Get settings. */
 #define ETHTOOL_SSET		0x00000002 /* Set settings, privileged. */
@@ -74,6 +83,8 @@ struct ethtool_regs {
 #define ETHTOOL_SMSGLVL		0x00000008 /* Set driver msg level, priv. */
 #define ETHTOOL_NWAY_RST	0x00000009 /* Restart autonegotiation, priv. */
 #define ETHTOOL_GLINK		0x0000000a /* Get link status */
+#define ETHTOOL_GEEPROM		0x0000000b /* Get EEPROM data */
+#define ETHTOOL_SEEPROM		0x0000000c /* Set EEPROM data */
 
 /* compatibility with older code */
 #define SPARC_ETH_GSET		ETHTOOL_GSET
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 935c6e9bfee8..f170f9e036ec 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1386,7 +1386,6 @@ extern int block_sync_page(struct page *);
 int generic_block_bmap(struct address_space *, long, get_block_t *);
 int generic_commit_write(struct file *, struct page *, unsigned, unsigned);
 int block_truncate_page(struct address_space *, loff_t, get_block_t *);
-extern void create_empty_buffers(struct page *, kdev_t, unsigned long);
 
 extern int waitfor_one_page(struct page*);
 extern int generic_file_mmap(struct file *, struct vm_area_struct *);
diff --git a/include/linux/ufs_fs.h b/include/linux/ufs_fs.h
index e50451a8602b..f776030c8b04 100644
--- a/include/linux/ufs_fs.h
+++ b/include/linux/ufs_fs.h
@@ -96,17 +96,6 @@
 #define UFS_FSBAD     ((char)0xff)
 
 /* From here to next blank line, s_flags for ufs_sb_info */
-/* endianness */
-#define UFS_BYTESEX             0x00000001      /* mask; leave room to 0xF */
-#if defined(__LITTLE_ENDIAN) || defined(__BIG_ENDIAN)
-/* these are for sane architectures */
-#define UFS_NATIVE_ENDIAN	0x00000000
-#define UFS_SWABBED_ENDIAN	0x00000001
-#else
-/* these are for pervert architectures */
-#define UFS_LITTLE_ENDIAN	0x00000000
-#define UFS_BIG_ENDIAN		0x00000001
-#endif
 /* directory entry encoding */
 #define UFS_DE_MASK		0x00000010	/* mask for the following */
 #define UFS_DE_OLD		0x00000000
@@ -417,7 +406,8 @@ struct ufs_super_block {
  * super block lock fs->fs_lock.
  */
 #define	CG_MAGIC	0x090255
-#define ufs_cg_chkmagic(ucg)	(SWAB32((ucg)->cg_magic) == CG_MAGIC)
+#define ufs_cg_chkmagic(sb, ucg) \
+	(fs32_to_cpu((sb), (ucg)->cg_magic) == CG_MAGIC)
 
 /*
  * size of this structure is 172 B
diff --git a/include/linux/ufs_fs_i.h b/include/linux/ufs_fs_i.h
index 7dd9791148b2..5f0287ab0139 100644
--- a/include/linux/ufs_fs_i.h
+++ b/include/linux/ufs_fs_i.h
@@ -18,7 +18,6 @@ struct ufs_inode_info {
 		__u32	i_data[15];
 		__u8	i_symlink[4*15];
 	} i_u1;
-	__u64	i_size;
 	__u32	i_flags;
 	__u32	i_gen;
 	__u32	i_shadow;
diff --git a/include/linux/ufs_fs_sb.h b/include/linux/ufs_fs_sb.h
index ac9d9c03d56b..41b6ccc1eebe 100644
--- a/include/linux/ufs_fs_sb.h
+++ b/include/linux/ufs_fs_sb.h
@@ -118,7 +118,7 @@ struct ufs_sb_private_info {
 struct ufs_sb_info {
 	struct ufs_sb_private_info * s_uspi;	
 	struct ufs_csum	* s_csp[UFS_MAXCSBUFS];
-	unsigned s_swab;
+	unsigned s_bytesex;
 	unsigned s_flags;
 	struct buffer_head ** s_ucg;
 	struct ufs_cg_private_info * s_ucpi[UFS_MAX_GROUP_LOADED];