Merge with 2.3.99-pre6.

5 files changed, 31 insertions, 23 deletions

diff --git a/include/asm-sparc/asm_offsets.h b/include/asm-sparc/asm_offsets.h
index 57c2ffd9b..66ebe6e4c 100644
--- a/include/asm-sparc/asm_offsets.h
+++ b/include/asm-sparc/asm_offsets.h
@@ -228,21 +228,25 @@
 #define ASIZ_mm_env_start	0x00000004
 #define AOFF_mm_env_end	0x0000006c
 #define ASIZ_mm_env_end	0x00000004
-#define AOFF_mm_rss	0x00000070
+#define AOFF_mm_min_flt	0x00000070
+#define ASIZ_mm_min_flt	0x00000004
+#define AOFF_mm_maj_flt	0x00000074
+#define ASIZ_mm_maj_flt	0x00000004
+#define AOFF_mm_rss	0x00000078
 #define ASIZ_mm_rss	0x00000004
-#define AOFF_mm_total_vm	0x00000074
+#define AOFF_mm_total_vm	0x0000007c
 #define ASIZ_mm_total_vm	0x00000004
-#define AOFF_mm_locked_vm	0x00000078
+#define AOFF_mm_locked_vm	0x00000080
 #define ASIZ_mm_locked_vm	0x00000004
-#define AOFF_mm_def_flags	0x0000007c
+#define AOFF_mm_def_flags	0x00000084
 #define ASIZ_mm_def_flags	0x00000004
-#define AOFF_mm_cpu_vm_mask	0x00000080
+#define AOFF_mm_cpu_vm_mask	0x00000088
 #define ASIZ_mm_cpu_vm_mask	0x00000004
-#define AOFF_mm_swap_cnt	0x00000084
+#define AOFF_mm_swap_cnt	0x0000008c
 #define ASIZ_mm_swap_cnt	0x00000004
-#define AOFF_mm_swap_address	0x00000088
+#define AOFF_mm_swap_address	0x00000090
 #define ASIZ_mm_swap_address	0x00000004
-#define AOFF_mm_segments	0x0000008c
+#define AOFF_mm_segments	0x00000094
 #define ASIZ_mm_segments	0x00000004
 #define AOFF_thread_uwinmask	0x00000000
 #define ASIZ_thread_uwinmask	0x00000004
@@ -509,21 +513,25 @@
 #define ASIZ_mm_env_start	0x00000004
 #define AOFF_mm_env_end	0x00000074
 #define ASIZ_mm_env_end	0x00000004
-#define AOFF_mm_rss	0x00000078
+#define AOFF_mm_min_flt	0x00000078
+#define ASIZ_mm_min_flt	0x00000004
+#define AOFF_mm_maj_flt	0x0000007c
+#define ASIZ_mm_maj_flt	0x00000004
+#define AOFF_mm_rss	0x00000080
 #define ASIZ_mm_rss	0x00000004
-#define AOFF_mm_total_vm	0x0000007c
+#define AOFF_mm_total_vm	0x00000084
 #define ASIZ_mm_total_vm	0x00000004
-#define AOFF_mm_locked_vm	0x00000080
+#define AOFF_mm_locked_vm	0x00000088
 #define ASIZ_mm_locked_vm	0x00000004
-#define AOFF_mm_def_flags	0x00000084
+#define AOFF_mm_def_flags	0x0000008c
 #define ASIZ_mm_def_flags	0x00000004
-#define AOFF_mm_cpu_vm_mask	0x00000088
+#define AOFF_mm_cpu_vm_mask	0x00000090
 #define ASIZ_mm_cpu_vm_mask	0x00000004
-#define AOFF_mm_swap_cnt	0x0000008c
+#define AOFF_mm_swap_cnt	0x00000094
 #define ASIZ_mm_swap_cnt	0x00000004
-#define AOFF_mm_swap_address	0x00000090
+#define AOFF_mm_swap_address	0x00000098
 #define ASIZ_mm_swap_address	0x00000004
-#define AOFF_mm_segments	0x00000094
+#define AOFF_mm_segments	0x0000009c
 #define ASIZ_mm_segments	0x00000004
 #define AOFF_thread_uwinmask	0x00000000
 #define ASIZ_thread_uwinmask	0x00000004
diff --git a/include/asm-sparc/elf.h b/include/asm-sparc/elf.h
index acc8f418e..c2f54c150 100644
--- a/include/asm-sparc/elf.h
+++ b/include/asm-sparc/elf.h
@@ -1,4 +1,4 @@
-/* $Id: elf.h,v 1.20 1998/09/14 09:11:10 davem Exp $ */
+/* $Id: elf.h,v 1.21 2000/04/14 09:59:04 davem Exp $ */
 #ifndef __ASMSPARC_ELF_H
 #define __ASMSPARC_ELF_H
 
@@ -105,8 +105,7 @@ typedef struct {
 #define ELF_PLATFORM	(NULL)
 
 #ifdef __KERNEL__
-#define SET_PERSONALITY(ex, ibcs2) \
-	current->personality = (ibcs2 ? PER_SVR4 : PER_LINUX)
+#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
 #endif
 
 #endif /* !(__ASMSPARC_ELF_H) */
diff --git a/include/asm-sparc/io.h b/include/asm-sparc/io.h
index cafd68674..a32ce08fe 100644
--- a/include/asm-sparc/io.h
+++ b/include/asm-sparc/io.h
@@ -1,5 +1,5 @@
 /*
- * $Id: io.h,v 1.26 2000/03/30 01:43:26 davem Exp $
+ * $Id: io.h,v 1.27 2000/04/13 04:45:59 davem Exp $
  */
 #ifndef __SPARC_IO_H
 #define __SPARC_IO_H
@@ -169,6 +169,7 @@ static inline void *sbus_memset_io(void *__dst, int c, __kernel_size_t n)
  * This is why we have no bus number argument to ioremap().
  */
 extern void *ioremap(unsigned long offset, unsigned long size);
+#define ioremap_nocache(X,Y)	ioremap((X),(Y))
 extern void iounmap(void *addr);
 
 /* P3: talk davem into dropping "name" argument in favor of res->name */
diff --git a/include/asm-sparc/jsflash.h b/include/asm-sparc/jsflash.h
index 2842049b2..3457f29bd 100644
--- a/include/asm-sparc/jsflash.h
+++ b/include/asm-sparc/jsflash.h
@@ -36,4 +36,4 @@ struct jsflash_program_arg {
 	__u32 size;
 };
 
-#endif /* _SPARC_IDE_H */
+#endif /* _SPARC_JSFLASH_H */
diff --git a/include/asm-sparc/namei.h b/include/asm-sparc/namei.h
index 18430c8d1..3ac97a41b 100644
--- a/include/asm-sparc/namei.h
+++ b/include/asm-sparc/namei.h
@@ -1,4 +1,4 @@
-/* $Id: namei.h,v 1.14 1999/06/10 05:23:12 davem Exp $
+/* $Id: namei.h,v 1.16 2000/04/13 00:55:54 davem Exp $
  * linux/include/asm-sparc/namei.h
  *
  * Routines to handle famous /usr/gnemul/s*.
@@ -14,7 +14,7 @@
 static inline char * __emul_prefix(void)
 {
 	switch (current->personality) {
-	case PER_BSD:
+	case PER_SUNOS:
 		return SPARC_BSD_EMUL;
 	case PER_SVR4:
 		return SPARC_SOL_EMUL;