v2.4.3.7 -> v2.4.3.8

  - Al Viro: fix d_flags race between low-level fs and VFS layer.
  - David Miller: sparc updates
  - S390 update

4 files changed, 10 insertions, 9 deletions

diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index e32a11742f47..da527b083f32 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -78,7 +78,7 @@ struct dentry {
 	unsigned long d_time;		/* used by d_revalidate */
 	struct dentry_operations  *d_op;
 	struct super_block * d_sb;	/* The root of the dentry tree */
-	unsigned long d_reftime;	/* last time referenced */
+	unsigned long d_vfs_flags;
 	void * d_fsdata;		/* fs-specific data */
 	unsigned char d_iname[DNAME_INLINE_LEN]; /* small names */
 };
diff --git a/include/linux/elf.h b/include/linux/elf.h
index b27c2d43c45e..22ebd781b305 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -74,6 +74,8 @@ typedef __u64	Elf64_Word;
 
 #define EM_X8664	62	/* AMD x86-64 */
 
+#define EM_S390		22	/* IBM S/390 */
+
 #define EM_CRIS         76      /* Axis Communications 32-bit embedded processor */
 
 /*
@@ -83,9 +85,9 @@ typedef __u64	Elf64_Word;
 #define EM_ALPHA	0x9026
 
 /*
- * This is an interim value for S390 architecture
+ * This is the old interim value for S/390 architecture
  */
-#define EM_S390         0xA390
+#define EM_S390_OLD     0xA390
 
 /* This is the info that is needed to parse the dynamic section of the file */
 #define DT_NULL		0
diff --git a/include/linux/fs.h b/include/linux/fs.h
index a71dbf25c0e6..39dc8ac3aa36 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -121,12 +121,6 @@ extern int leases_enable, dir_notify_enable, lease_break_time;
 #define MS_RMT_MASK	(MS_RDONLY|MS_NOSUID|MS_NODEV|MS_NOEXEC|\
 			MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME|MS_NODIRATIME)
 
-/*
- * Magic mount flag number. Has to be or-ed to the flag values.
- */
-#define MS_MGC_VAL 0xC0ED0000	/* magic flag number to indicate "new" flags */
-#define MS_MGC_MSK 0xffff0000	/* magic flag number mask */
-
 /* Inode flags - they have nothing to superblock flags now */
 
 #define S_SYNC		1	/* Writes are synced at once */
diff --git a/include/linux/string.h b/include/linux/string.h
index e23d4989e008..b5497d139d28 100644
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -1,6 +1,10 @@
 #ifndef _LINUX_STRING_H_
 #define _LINUX_STRING_H_
 
+/* We don't want strings.h stuff being user by user stuff by accident */
+
+#ifdef __KERNEL__
+
 #include <linux/types.h>	/* for size_t */
 #include <linux/stddef.h>	/* for NULL */
 
@@ -80,4 +84,5 @@ extern void * memchr(const void *,int,__kernel_size_t);
 }
 #endif
 
+#endif
 #endif /* _LINUX_STRING_H_ */