Merge with Linux 2.4.0-test3-pre5. 64-bit kernel are still not

-Werror clean.

26 files changed, 299 insertions, 299 deletions

diff --git a/include/asm-alpha/bitops.h b/include/asm-alpha/bitops.h
index 0d7a881a7..4cdfb21d5 100644
--- a/include/asm-alpha/bitops.h
+++ b/include/asm-alpha/bitops.h
@@ -290,8 +290,9 @@ found_middle:
 #define ext2_find_next_zero_bit      find_next_zero_bit
 
 /* Bitmap functions for the minix filesystem.  */
-#define minix_set_bit(nr,addr) test_and_set_bit(nr,addr)
-#define minix_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
+#define minix_test_and_set_bit(nr,addr) test_and_set_bit(nr,addr)
+#define minix_set_bit(nr,addr) set_bit(nr,addr)
+#define minix_test_and_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
 #define minix_test_bit(nr,addr) test_bit(nr,addr)
 #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)
 
diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h
index 666efc117..9773f6749 100644
--- a/include/asm-arm/bitops.h
+++ b/include/asm-arm/bitops.h
@@ -80,8 +80,9 @@ extern __inline__ unsigned long ffz(unsigned long word)
 #define ext2_find_next_zero_bit		find_next_zero_bit
 
 /* Bitmap functions for the minix filesystem. */
-#define minix_set_bit(nr,addr)		test_and_set_bit(nr,addr)
-#define minix_clear_bit(nr,addr)	test_and_clear_bit(nr,addr)
+#define minix_test_and_set_bit(nr,addr)	test_and_set_bit(nr,addr)
+#define minix_set_bit(nr,addr)		set_bit(nr,addr)
+#define minix_test_and_clear_bit(nr,addr)	test_and_clear_bit(nr,addr)
 #define minix_test_bit(nr,addr)		test_bit(nr,addr)
 #define minix_find_first_zero_bit(addr,size)	find_first_zero_bit(addr,size)
 
diff --git a/include/asm-i386/bitops.h b/include/asm-i386/bitops.h
index e8c859dd4..53486c977 100644
--- a/include/asm-i386/bitops.h
+++ b/include/asm-i386/bitops.h
@@ -227,8 +227,9 @@ extern __inline__ int ffs(int x)
 #define ext2_find_next_zero_bit      find_next_zero_bit
 
 /* Bitmap functions for the minix filesystem.  */
-#define minix_set_bit(nr,addr) test_and_set_bit(nr,addr)
-#define minix_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
+#define minix_test_and_set_bit(nr,addr) test_and_set_bit(nr,addr)
+#define minix_set_bit(nr,addr) set_bit(nr,addr)
+#define minix_test_and_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
 #define minix_test_bit(nr,addr) test_bit(nr,addr)
 #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)
 
diff --git a/include/asm-i386/processor.h b/include/asm-i386/processor.h
index 80aeb3201..e9faddd62 100644
--- a/include/asm-i386/processor.h
+++ b/include/asm-i386/processor.h
@@ -144,8 +144,7 @@ extern inline void cpuid(int op, int *eax, int *ebx, int *ecx, int *edx)
 		  "=b" (*ebx),
 		  "=c" (*ecx),
 		  "=d" (*edx)
-		: "a" (op)
-		: "cc");
+		: "a" (op));
 }
 
 
diff --git a/include/asm-ia64/bitops.h b/include/asm-ia64/bitops.h
index 13b9dcbdc..054704c47 100644
--- a/include/asm-ia64/bitops.h
+++ b/include/asm-ia64/bitops.h
@@ -231,8 +231,9 @@ found_middle:
 #define ext2_find_next_zero_bit      find_next_zero_bit
 
 /* Bitmap functions for the minix filesystem.  */
-#define minix_set_bit(nr,addr)			test_and_set_bit(nr,addr)
-#define minix_clear_bit(nr,addr)		test_and_clear_bit(nr,addr)
+#define minix_test_and_set_bit(nr,addr)		test_and_set_bit(nr,addr)
+#define minix_set_bit(nr,addr)			set_bit(nr,addr)
+#define minix_test_and_clear_bit(nr,addr)	test_and_clear_bit(nr,addr)
 #define minix_test_bit(nr,addr)			test_bit(nr,addr)
 #define minix_find_first_zero_bit(addr,size)	find_first_zero_bit(addr,size)
 
diff --git a/include/asm-m68k/bitops.h b/include/asm-m68k/bitops.h
index e17fdf7f8..ff1c8b9fa 100644
--- a/include/asm-m68k/bitops.h
+++ b/include/asm-m68k/bitops.h
@@ -262,7 +262,7 @@ minix_find_first_zero_bit (const void *vaddr, unsigned size)
 }
 
 extern __inline__ int
-minix_set_bit (int nr, void *vaddr)
+minix_test_and_set_bit (int nr, void *vaddr)
 {
 	char retval;
 
@@ -272,8 +272,10 @@ minix_set_bit (int nr, void *vaddr)
 	return retval;
 }
 
+#define minix_set_bit(nr,addr)	((void)minix_test_and_set_bit(nr,addr))
+
 extern __inline__ int
-minix_clear_bit (int nr, void *vaddr)
+minix_test_and_clear_bit (int nr, void *vaddr)
 {
 	char retval;
 
diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h
index caffa4ede..326294ab2 100644
--- a/include/asm-mips/bitops.h
+++ b/include/asm-mips/bitops.h
@@ -553,8 +553,9 @@ found_middle:
  * FIXME: These assume that Minix uses the native byte/bitorder.
  * This limits the Minix filesystem's value for data exchange very much.
  */
-#define minix_set_bit(nr,addr) test_and_set_bit(nr,addr)
-#define minix_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
+#define minix_test_and_set_bit(nr,addr) test_and_set_bit(nr,addr)
+#define minix_set_bit(nr,addr) set_bit(nr,addr)
+#define minix_test_and_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
 #define minix_test_bit(nr,addr) test_bit(nr,addr)
 #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)
 
diff --git a/include/asm-mips64/bitops.h b/include/asm-mips64/bitops.h
index 5f27e05cf..90fcb8688 100644
--- a/include/asm-mips64/bitops.h
+++ b/include/asm-mips64/bitops.h
@@ -443,8 +443,9 @@ found_middle:
  * FIXME: These assume that Minix uses the native byte/bitorder.
  * This limits the Minix filesystem's value for data exchange very much.
  */
-#define minix_set_bit(nr,addr) test_and_set_bit(nr,addr)
-#define minix_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
+#define minix_test_and_set_bit(nr,addr) test_and_set_bit(nr,addr)
+#define minix_set_bit(nr,addr) set_bit(nr,addr)
+#define minix_test_and_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
 #define minix_test_bit(nr,addr) test_bit(nr,addr)
 #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)
 
diff --git a/include/asm-ppc/bitops.h b/include/asm-ppc/bitops.h
index 7f6f12155..ccb0f199f 100644
--- a/include/asm-ppc/bitops.h
+++ b/include/asm-ppc/bitops.h
@@ -325,8 +325,9 @@ found_middle:
 }
 
 /* Bitmap functions for the minix filesystem.  */
-#define minix_set_bit(nr,addr) ext2_set_bit(nr,addr)
-#define minix_clear_bit(nr,addr) ext2_clear_bit(nr,addr)
+#define minix_test_and_set_bit(nr,addr) ext2_set_bit(nr,addr)
+#define minix_set_bit(nr,addr) ((void)ext2_set_bit(nr,addr))
+#define minix_test_and_clear_bit(nr,addr) ext2_clear_bit(nr,addr)
 #define minix_test_bit(nr,addr) ext2_test_bit(nr,addr)
 #define minix_find_first_zero_bit(addr,size) ext2_find_first_zero_bit(addr,size)
 
diff --git a/include/asm-s390/bitops.h b/include/asm-s390/bitops.h
index 3043d3b60..710cf8829 100644
--- a/include/asm-s390/bitops.h
+++ b/include/asm-s390/bitops.h
@@ -878,8 +878,9 @@ ext2_find_next_zero_bit(void *vaddr, unsigned size, unsigned offset)
 
 /* Bitmap functions for the minix filesystem.  */
 /* FIXME !!! */
-#define minix_set_bit(nr,addr) test_and_set_bit(nr,addr)
-#define minix_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
+#define minix_test_and_set_bit(nr,addr) test_and_set_bit(nr,addr)
+#define minix_set_bit(nr,addr) set_bit(nr,addr)
+#define minix_test_and_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
 #define minix_test_bit(nr,addr) test_bit(nr,addr)
 #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)
 
diff --git a/include/asm-sh/bitops.h b/include/asm-sh/bitops.h
index 85462da1e..6ce4ea388 100644
--- a/include/asm-sh/bitops.h
+++ b/include/asm-sh/bitops.h
@@ -254,8 +254,9 @@ found_middle:
 #endif
 
 /* Bitmap functions for the minix filesystem.  */
-#define minix_set_bit(nr,addr) test_and_set_bit(nr,addr)
-#define minix_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
+#define minix_test_and_set_bit(nr,addr) test_and_set_bit(nr,addr)
+#define minix_set_bit(nr,addr) set_bit(nr,addr)
+#define minix_test_and_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
 #define minix_test_bit(nr,addr) test_bit(nr,addr)
 #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)
 
diff --git a/include/asm-sparc/asm_offsets.h b/include/asm-sparc/asm_offsets.h
index f4af06b1f..3447973a0 100644
--- a/include/asm-sparc/asm_offsets.h
+++ b/include/asm-sparc/asm_offsets.h
@@ -99,94 +99,94 @@
 #define AOFF_task_it_virt_incr	0x000000cc
 #define ASIZ_task_it_virt_incr	0x00000004
 #define AOFF_task_real_timer	0x000000d0
-#define ASIZ_task_real_timer	0x00000018
-#define AOFF_task_times	0x000000e8
+#define ASIZ_task_real_timer	0x00000014
+#define AOFF_task_times	0x000000e4
 #define ASIZ_task_times	0x00000010
-#define AOFF_task_start_time	0x000000f8
+#define AOFF_task_start_time	0x000000f4
 #define ASIZ_task_start_time	0x00000004
-#define AOFF_task_per_cpu_utime	0x000000fc
+#define AOFF_task_per_cpu_utime	0x000000f8
 #define ASIZ_task_per_cpu_utime	0x00000004
-#define AOFF_task_min_flt	0x00000104
+#define AOFF_task_min_flt	0x00000100
 #define ASIZ_task_min_flt	0x00000004
-#define AOFF_task_maj_flt	0x00000108
+#define AOFF_task_maj_flt	0x00000104
 #define ASIZ_task_maj_flt	0x00000004
-#define AOFF_task_nswap	0x0000010c
+#define AOFF_task_nswap	0x00000108
 #define ASIZ_task_nswap	0x00000004
-#define AOFF_task_cmin_flt	0x00000110
+#define AOFF_task_cmin_flt	0x0000010c
 #define ASIZ_task_cmin_flt	0x00000004
-#define AOFF_task_cmaj_flt	0x00000114
+#define AOFF_task_cmaj_flt	0x00000110
 #define ASIZ_task_cmaj_flt	0x00000004
-#define AOFF_task_cnswap	0x00000118
+#define AOFF_task_cnswap	0x00000114
 #define ASIZ_task_cnswap	0x00000004
-#define AOFF_task_uid	0x00000120
+#define AOFF_task_uid	0x0000011c
 #define ASIZ_task_uid	0x00000004
-#define AOFF_task_euid	0x00000124
+#define AOFF_task_euid	0x00000120
 #define ASIZ_task_euid	0x00000004
-#define AOFF_task_suid	0x00000128
+#define AOFF_task_suid	0x00000124
 #define ASIZ_task_suid	0x00000004
-#define AOFF_task_fsuid	0x0000012c
+#define AOFF_task_fsuid	0x00000128
 #define ASIZ_task_fsuid	0x00000004
-#define AOFF_task_gid	0x00000130
+#define AOFF_task_gid	0x0000012c
 #define ASIZ_task_gid	0x00000004
-#define AOFF_task_egid	0x00000134
+#define AOFF_task_egid	0x00000130
 #define ASIZ_task_egid	0x00000004
-#define AOFF_task_sgid	0x00000138
+#define AOFF_task_sgid	0x00000134
 #define ASIZ_task_sgid	0x00000004
-#define AOFF_task_fsgid	0x0000013c
+#define AOFF_task_fsgid	0x00000138
 #define ASIZ_task_fsgid	0x00000004
-#define AOFF_task_ngroups	0x00000140
+#define AOFF_task_ngroups	0x0000013c
 #define ASIZ_task_ngroups	0x00000004
-#define AOFF_task_groups	0x00000144
+#define AOFF_task_groups	0x00000140
 #define ASIZ_task_groups	0x00000080
-#define AOFF_task_cap_effective	0x000001c4
+#define AOFF_task_cap_effective	0x000001c0
 #define ASIZ_task_cap_effective	0x00000004
-#define AOFF_task_cap_inheritable	0x000001c8
+#define AOFF_task_cap_inheritable	0x000001c4
 #define ASIZ_task_cap_inheritable	0x00000004
-#define AOFF_task_cap_permitted	0x000001cc
+#define AOFF_task_cap_permitted	0x000001c8
 #define ASIZ_task_cap_permitted	0x00000004
-#define AOFF_task_user	0x000001d4
+#define AOFF_task_user	0x000001d0
 #define ASIZ_task_user	0x00000004
-#define AOFF_task_rlim	0x000001d8
+#define AOFF_task_rlim	0x000001d4
 #define ASIZ_task_rlim	0x00000050
-#define AOFF_task_used_math	0x00000228
+#define AOFF_task_used_math	0x00000224
 #define ASIZ_task_used_math	0x00000002
-#define AOFF_task_comm	0x0000022a
+#define AOFF_task_comm	0x00000226
 #define ASIZ_task_comm	0x00000010
-#define AOFF_task_link_count	0x0000023c
+#define AOFF_task_link_count	0x00000238
 #define ASIZ_task_link_count	0x00000004
-#define AOFF_task_tty	0x00000240
+#define AOFF_task_tty	0x0000023c
 #define ASIZ_task_tty	0x00000004
-#define AOFF_task_semundo	0x00000244
+#define AOFF_task_semundo	0x00000240
 #define ASIZ_task_semundo	0x00000004
-#define AOFF_task_semsleeping	0x00000248
+#define AOFF_task_semsleeping	0x00000244
 #define ASIZ_task_semsleeping	0x00000004
-#define AOFF_task_thread	0x00000250
+#define AOFF_task_thread	0x00000248
 #define ASIZ_task_thread	0x00000380
-#define AOFF_task_fs	0x000005d0
+#define AOFF_task_fs	0x000005c8
 #define ASIZ_task_fs	0x00000004
-#define AOFF_task_files	0x000005d4
+#define AOFF_task_files	0x000005cc
 #define ASIZ_task_files	0x00000004
-#define AOFF_task_sigmask_lock	0x000005d8
+#define AOFF_task_sigmask_lock	0x000005d0
 #define ASIZ_task_sigmask_lock	0x00000004
-#define AOFF_task_sig	0x000005dc
+#define AOFF_task_sig	0x000005d4
 #define ASIZ_task_sig	0x00000004
-#define AOFF_task_signal	0x000005e0
+#define AOFF_task_signal	0x000005d8
 #define ASIZ_task_signal	0x00000008
-#define AOFF_task_blocked	0x000005e8
+#define AOFF_task_blocked	0x000005e0
 #define ASIZ_task_blocked	0x00000008
-#define AOFF_task_sigqueue	0x000005f0
+#define AOFF_task_sigqueue	0x000005e8
 #define ASIZ_task_sigqueue	0x00000004
-#define AOFF_task_sigqueue_tail	0x000005f4
+#define AOFF_task_sigqueue_tail	0x000005ec
 #define ASIZ_task_sigqueue_tail	0x00000004
-#define AOFF_task_sas_ss_sp	0x000005f8
+#define AOFF_task_sas_ss_sp	0x000005f0
 #define ASIZ_task_sas_ss_sp	0x00000004
-#define AOFF_task_sas_ss_size	0x000005fc
+#define AOFF_task_sas_ss_size	0x000005f4
 #define ASIZ_task_sas_ss_size	0x00000004
-#define AOFF_task_parent_exec_id	0x00000600
+#define AOFF_task_parent_exec_id	0x000005f8
 #define ASIZ_task_parent_exec_id	0x00000004
-#define AOFF_task_self_exec_id	0x00000604
+#define AOFF_task_self_exec_id	0x000005fc
 #define ASIZ_task_self_exec_id	0x00000004
-#define AOFF_task_alloc_lock	0x00000608
+#define AOFF_task_alloc_lock	0x00000600
 #define ASIZ_task_alloc_lock	0x00000004
 #define AOFF_mm_mmap	0x00000000
 #define ASIZ_mm_mmap	0x00000004
@@ -382,66 +382,66 @@
 #define AOFF_task_it_virt_incr	0x000000d0
 #define ASIZ_task_it_virt_incr	0x00000004
 #define AOFF_task_real_timer	0x000000d4
-#define ASIZ_task_real_timer	0x00000018
-#define AOFF_task_times	0x000000ec
+#define ASIZ_task_real_timer	0x00000014
+#define AOFF_task_times	0x000000e8
 #define ASIZ_task_times	0x00000010
-#define AOFF_task_start_time	0x000000fc
+#define AOFF_task_start_time	0x000000f8
 #define ASIZ_task_start_time	0x00000004
-#define AOFF_task_per_cpu_utime	0x00000100
+#define AOFF_task_per_cpu_utime	0x000000fc
 #define ASIZ_task_per_cpu_utime	0x00000080
-#define AOFF_task_min_flt	0x00000200
+#define AOFF_task_min_flt	0x000001fc
 #define ASIZ_task_min_flt	0x00000004
-#define AOFF_task_maj_flt	0x00000204
+#define AOFF_task_maj_flt	0x00000200
 #define ASIZ_task_maj_flt	0x00000004
-#define AOFF_task_nswap	0x00000208
+#define AOFF_task_nswap	0x00000204
 #define ASIZ_task_nswap	0x00000004
-#define AOFF_task_cmin_flt	0x0000020c
+#define AOFF_task_cmin_flt	0x00000208
 #define ASIZ_task_cmin_flt	0x00000004
-#define AOFF_task_cmaj_flt	0x00000210
+#define AOFF_task_cmaj_flt	0x0000020c
 #define ASIZ_task_cmaj_flt	0x00000004
-#define AOFF_task_cnswap	0x00000214
+#define AOFF_task_cnswap	0x00000210
 #define ASIZ_task_cnswap	0x00000004
-#define AOFF_task_uid	0x0000021c
+#define AOFF_task_uid	0x00000218
 #define ASIZ_task_uid	0x00000004
-#define AOFF_task_euid	0x00000220
+#define AOFF_task_euid	0x0000021c
 #define ASIZ_task_euid	0x00000004
-#define AOFF_task_suid	0x00000224
+#define AOFF_task_suid	0x00000220
 #define ASIZ_task_suid	0x00000004
-#define AOFF_task_fsuid	0x00000228
+#define AOFF_task_fsuid	0x00000224
 #define ASIZ_task_fsuid	0x00000004
-#define AOFF_task_gid	0x0000022c
+#define AOFF_task_gid	0x00000228
 #define ASIZ_task_gid	0x00000004
-#define AOFF_task_egid	0x00000230
+#define AOFF_task_egid	0x0000022c
 #define ASIZ_task_egid	0x00000004
-#define AOFF_task_sgid	0x00000234
+#define AOFF_task_sgid	0x00000230
 #define ASIZ_task_sgid	0x00000004
-#define AOFF_task_fsgid	0x00000238
+#define AOFF_task_fsgid	0x00000234
 #define ASIZ_task_fsgid	0x00000004
-#define AOFF_task_ngroups	0x0000023c
+#define AOFF_task_ngroups	0x00000238
 #define ASIZ_task_ngroups	0x00000004
-#define AOFF_task_groups	0x00000240
+#define AOFF_task_groups	0x0000023c
 #define ASIZ_task_groups	0x00000080
-#define AOFF_task_cap_effective	0x000002c0
+#define AOFF_task_cap_effective	0x000002bc
 #define ASIZ_task_cap_effective	0x00000004
-#define AOFF_task_cap_inheritable	0x000002c4
+#define AOFF_task_cap_inheritable	0x000002c0
 #define ASIZ_task_cap_inheritable	0x00000004
-#define AOFF_task_cap_permitted	0x000002c8
+#define AOFF_task_cap_permitted	0x000002c4
 #define ASIZ_task_cap_permitted	0x00000004
-#define AOFF_task_user	0x000002d0
+#define AOFF_task_user	0x000002cc
 #define ASIZ_task_user	0x00000004
-#define AOFF_task_rlim	0x000002d4
+#define AOFF_task_rlim	0x000002d0
 #define ASIZ_task_rlim	0x00000050
-#define AOFF_task_used_math	0x00000324
+#define AOFF_task_used_math	0x00000320
 #define ASIZ_task_used_math	0x00000002
-#define AOFF_task_comm	0x00000326
+#define AOFF_task_comm	0x00000322
 #define ASIZ_task_comm	0x00000010
-#define AOFF_task_link_count	0x00000338
+#define AOFF_task_link_count	0x00000334
 #define ASIZ_task_link_count	0x00000004
-#define AOFF_task_tty	0x0000033c
+#define AOFF_task_tty	0x00000338
 #define ASIZ_task_tty	0x00000004
-#define AOFF_task_semundo	0x00000340
+#define AOFF_task_semundo	0x0000033c
 #define ASIZ_task_semundo	0x00000004
-#define AOFF_task_semsleeping	0x00000344
+#define AOFF_task_semsleeping	0x00000340
 #define ASIZ_task_semsleeping	0x00000004
 #define AOFF_task_thread	0x00000348
 #define ASIZ_task_thread	0x00000380
diff --git a/include/asm-sparc/bitops.h b/include/asm-sparc/bitops.h
index b2c8acfff..eb9710eb1 100644
--- a/include/asm-sparc/bitops.h
+++ b/include/asm-sparc/bitops.h
@@ -1,4 +1,4 @@
-/* $Id: bitops.h,v 1.56 2000/05/09 17:40:15 davem Exp $
+/* $Id: bitops.h,v 1.57 2000/06/30 10:18:39 davem Exp $
  * bitops.h: Bit string operations on the Sparc.
  *
  * Copyright 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -399,8 +399,9 @@ found_middle:
 #define ext2_find_next_zero_bit      find_next_zero_le_bit
 
 /* Bitmap functions for the minix filesystem.  */
-#define minix_set_bit(nr,addr) test_and_set_bit(nr,addr)
-#define minix_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
+#define minix_test_and_set_bit(nr,addr) test_and_set_bit(nr,addr)
+#define minix_set_bit(nr,addr) set_bit(nr,addr)
+#define minix_test_and_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
 #define minix_test_bit(nr,addr) test_bit(nr,addr)
 #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)
 
diff --git a/include/asm-sparc/fcntl.h b/include/asm-sparc/fcntl.h
index ec122d7dc..2a373ed60 100644
--- a/include/asm-sparc/fcntl.h
+++ b/include/asm-sparc/fcntl.h
@@ -1,4 +1,4 @@
-/* $Id: fcntl.h,v 1.12 1999/12/27 06:37:11 anton Exp $ */
+/* $Id: fcntl.h,v 1.13 2000/07/06 01:41:45 davem Exp $ */
 #ifndef _SPARC_FCNTL_H
 #define _SPARC_FCNTL_H
 
diff --git a/include/asm-sparc/hardirq.h b/include/asm-sparc/hardirq.h
index c34312aa4..8b7b095ad 100644
--- a/include/asm-sparc/hardirq.h
+++ b/include/asm-sparc/hardirq.h
@@ -11,23 +11,24 @@
 #include <linux/threads.h>
 
 #ifndef CONFIG_SMP
-extern unsigned int local_irq_count;
+extern unsigned int __local_irq_count;
+#define local_irq_count(cpu)	__local_irq_count
 
 /*
  * Are we in an interrupt context? Either doing bottom half
  * or hardware interrupt processing?
  */
-#define in_interrupt()  ((local_irq_count + local_bh_count) != 0)
+#define in_interrupt()  ((__local_irq_count + __local_bh_count) != 0)
 
-#define hardirq_trylock(cpu)	((void)(cpu), local_irq_count == 0)
+#define hardirq_trylock(cpu)	((void)(cpu), __local_irq_count == 0)
 #define hardirq_endlock(cpu)	do { (void)(cpu); } while (0)
 
-#define hardirq_enter(cpu)	(local_irq_count++)
-#define hardirq_exit(cpu)	(local_irq_count--)
+#define hardirq_enter(cpu)	(__local_irq_count++)
+#define hardirq_exit(cpu)	(__local_irq_count--)
 
 #define synchronize_irq()	barrier()
 
-#define in_irq() (local_irq_count != 0)
+#define in_irq() (__local_irq_count != 0)
 
 #else
 
@@ -36,7 +37,8 @@ extern unsigned int local_irq_count;
 #include <asm/system.h>
 #include <asm/smp.h>
 
-extern unsigned int local_irq_count[NR_CPUS];
+extern unsigned int __local_irq_count[NR_CPUS];
+#define local_irq_count(cpu)	__local_irq_count[cpu]
 extern unsigned char global_irq_holder;
 extern spinlock_t global_irq_lock;
 extern atomic_t global_irq_count;
@@ -46,10 +48,10 @@ extern atomic_t global_irq_count;
  * or hardware interrupt processing?
  */
 #define in_interrupt() ({ int __cpu = smp_processor_id(); \
-	(local_irq_count[__cpu] + local_bh_count[__cpu] != 0); })
+	(local_irq_count(__cpu) + local_bh_count(__cpu) != 0); })
 
 #define in_irq() ({ int __cpu = smp_processor_id(); \
-	(local_irq_count[__cpu] != 0); })
+	(local_irq_count(__cpu) != 0); })
 
 static inline void release_irqlock(int cpu)
 {
@@ -62,14 +64,14 @@ static inline void release_irqlock(int cpu)
 
 static inline void hardirq_enter(int cpu)
 {
-	++local_irq_count[cpu];
+	++local_irq_count(cpu);
 	atomic_inc(&global_irq_count);
 }
 
 static inline void hardirq_exit(int cpu)
 {
 	atomic_dec(&global_irq_count);
-	--local_irq_count[cpu];
+	--local_irq_count(cpu);
 }
 
 static inline int hardirq_trylock(int cpu)
diff --git a/include/asm-sparc/irq.h b/include/asm-sparc/irq.h
index 512a8e818..5859d82e9 100644
--- a/include/asm-sparc/irq.h
+++ b/include/asm-sparc/irq.h
@@ -1,4 +1,4 @@
-/* $Id: irq.h,v 1.29 2000/05/09 17:40:15 davem Exp $
+/* $Id: irq.h,v 1.30 2000/06/30 10:18:39 davem Exp $
  * irq.h: IRQ registers on the Sparc.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -23,16 +23,16 @@ BTFIXUPDEF_CALL(char *, __irq_itoa, unsigned int)
 
 /* IRQ handler dispatch entry and exit. */
 #ifdef CONFIG_SMP
-extern unsigned int local_irq_count[NR_CPUS];
+extern unsigned int __local_irq_count[NR_CPUS];
 #define irq_enter(cpu, irq)                     \
 do {    hardirq_enter(cpu);                     \
         spin_unlock_wait(&global_irq_lock);     \
 	} while(0)
 #define irq_exit(cpu, irq)      hardirq_exit(cpu)
 #else
-extern unsigned int local_irq_count;
-#define irq_enter(cpu, irq)     (local_irq_count++)
-#define irq_exit(cpu, irq)      (local_irq_count--)
+extern unsigned int __local_irq_count;
+#define irq_enter(cpu, irq)     (__local_irq_count++)
+#define irq_exit(cpu, irq)      (__local_irq_count--)
 #endif
 
 /* Dave Redman (djhr@tadpole.co.uk)
diff --git a/include/asm-sparc/softirq.h b/include/asm-sparc/softirq.h
index ec3e43f59..f35407dc8 100644
--- a/include/asm-sparc/softirq.h
+++ b/include/asm-sparc/softirq.h
@@ -16,20 +16,23 @@
 
 
 #ifdef CONFIG_SMP
-extern unsigned int local_bh_count[NR_CPUS];
+extern unsigned int __local_bh_count[NR_CPUS];
+#define local_bh_count(cpu)	__local_bh_count[cpu]
 
-#define local_bh_disable()	(local_bh_count[smp_processor_id()]++)
-#define local_bh_enable()	(local_bh_count[smp_processor_id()]--)
+#define local_bh_disable()	(local_bh_count(smp_processor_id())++)
+#define local_bh_enable()	(local_bh_count(smp_processor_id())--)
 
-#define in_softirq() (local_bh_count[smp_processor_id()] != 0)
+#define in_softirq() (local_bh_count(smp_processor_id()) != 0)
 
 #else
-extern unsigned int local_bh_count;
 
-#define local_bh_disable()	(local_bh_count++)
-#define local_bh_enable()	(local_bh_count--)
+extern unsigned int __local_bh_count;
+#define local_bh_count(cpu)	__local_bh_count
 
-#define in_softirq() (local_bh_count != 0)
+#define local_bh_disable()	(__local_bh_count++)
+#define local_bh_enable()	(__local_bh_count--)
+
+#define in_softirq() (__local_bh_count != 0)
 
 #endif	/* SMP */
 
diff --git a/include/asm-sparc64/asm_offsets.h b/include/asm-sparc64/asm_offsets.h
index 70e1356fd..832e22fa3 100644
--- a/include/asm-sparc64/asm_offsets.h
+++ b/include/asm-sparc64/asm_offsets.h
@@ -105,96 +105,96 @@
 #define AOFF_task_it_virt_incr	0x00000168
 #define ASIZ_task_it_virt_incr	0x00000008
 #define AOFF_task_real_timer	0x00000170
-#define ASIZ_task_real_timer	0x00000030
-#define AOFF_task_times	0x000001a0
+#define ASIZ_task_real_timer	0x00000028
+#define AOFF_task_times	0x00000198
 #define ASIZ_task_times	0x00000020
-#define AOFF_task_start_time	0x000001c0
+#define AOFF_task_start_time	0x000001b8
 #define ASIZ_task_start_time	0x00000008
-#define AOFF_task_per_cpu_utime	0x000001c8
+#define AOFF_task_per_cpu_utime	0x000001c0
 #define ASIZ_task_per_cpu_utime	0x00000008
-#define AOFF_task_min_flt	0x000001d8
+#define AOFF_task_min_flt	0x000001d0
 #define ASIZ_task_min_flt	0x00000008
-#define AOFF_task_maj_flt	0x000001e0
+#define AOFF_task_maj_flt	0x000001d8
 #define ASIZ_task_maj_flt	0x00000008
-#define AOFF_task_nswap	0x000001e8
+#define AOFF_task_nswap	0x000001e0
 #define ASIZ_task_nswap	0x00000008
-#define AOFF_task_cmin_flt	0x000001f0
+#define AOFF_task_cmin_flt	0x000001e8
 #define ASIZ_task_cmin_flt	0x00000008
-#define AOFF_task_cmaj_flt	0x000001f8
+#define AOFF_task_cmaj_flt	0x000001f0
 #define ASIZ_task_cmaj_flt	0x00000008
-#define AOFF_task_cnswap	0x00000200
+#define AOFF_task_cnswap	0x000001f8
 #define ASIZ_task_cnswap	0x00000008
-#define AOFF_task_uid	0x0000020c
+#define AOFF_task_uid	0x00000204
 #define ASIZ_task_uid	0x00000004
-#define AOFF_task_euid	0x00000210
+#define AOFF_task_euid	0x00000208
 #define ASIZ_task_euid	0x00000004
-#define AOFF_task_suid	0x00000214
+#define AOFF_task_suid	0x0000020c
 #define ASIZ_task_suid	0x00000004
-#define AOFF_task_fsuid	0x00000218
+#define AOFF_task_fsuid	0x00000210
 #define ASIZ_task_fsuid	0x00000004
-#define AOFF_task_gid	0x0000021c
+#define AOFF_task_gid	0x00000214
 #define ASIZ_task_gid	0x00000004
-#define AOFF_task_egid	0x00000220
+#define AOFF_task_egid	0x00000218
 #define ASIZ_task_egid	0x00000004
-#define AOFF_task_sgid	0x00000224
+#define AOFF_task_sgid	0x0000021c
 #define ASIZ_task_sgid	0x00000004
-#define AOFF_task_fsgid	0x00000228
+#define AOFF_task_fsgid	0x00000220
 #define ASIZ_task_fsgid	0x00000004
-#define AOFF_task_ngroups	0x0000022c
+#define AOFF_task_ngroups	0x00000224
 #define ASIZ_task_ngroups	0x00000004
-#define AOFF_task_groups	0x00000230
+#define AOFF_task_groups	0x00000228
 #define ASIZ_task_groups	0x00000080
-#define AOFF_task_cap_effective	0x000002b0
+#define AOFF_task_cap_effective	0x000002a8
 #define ASIZ_task_cap_effective	0x00000004
-#define AOFF_task_cap_inheritable	0x000002b4
+#define AOFF_task_cap_inheritable	0x000002ac
 #define ASIZ_task_cap_inheritable	0x00000004
-#define AOFF_task_cap_permitted	0x000002b8
+#define AOFF_task_cap_permitted	0x000002b0
 #define ASIZ_task_cap_permitted	0x00000004
-#define AOFF_task_user	0x000002c0
+#define AOFF_task_user	0x000002b8
 #define ASIZ_task_user	0x00000008
-#define AOFF_task_rlim	0x000002c8
+#define AOFF_task_rlim	0x000002c0
 #define ASIZ_task_rlim	0x000000a0
-#define AOFF_task_used_math	0x00000368
+#define AOFF_task_used_math	0x00000360
 #define ASIZ_task_used_math	0x00000002
-#define AOFF_task_comm	0x0000036a
+#define AOFF_task_comm	0x00000362
 #define ASIZ_task_comm	0x00000010
-#define AOFF_task_link_count	0x0000037c
+#define AOFF_task_link_count	0x00000374
 #define ASIZ_task_link_count	0x00000004
-#define AOFF_task_tty	0x00000380
+#define AOFF_task_tty	0x00000378
 #define ASIZ_task_tty	0x00000008
-#define AOFF_task_semundo	0x00000388
+#define AOFF_task_semundo	0x00000380
 #define ASIZ_task_semundo	0x00000008
-#define AOFF_task_semsleeping	0x00000390
+#define AOFF_task_semsleeping	0x00000388
 #define ASIZ_task_semsleeping	0x00000008
-#define AOFF_task_thread	0x000003a0
+#define AOFF_task_thread	0x00000390
 #define ASIZ_task_thread	0x00000450
-#define AOFF_task_fs	0x000007f0
+#define AOFF_task_fs	0x000007e0
 #define ASIZ_task_fs	0x00000008
-#define AOFF_task_files	0x000007f8
+#define AOFF_task_files	0x000007e8
 #define ASIZ_task_files	0x00000008
-#define AOFF_task_sigmask_lock	0x00000800
+#define AOFF_task_sigmask_lock	0x000007f0
 #define ASIZ_task_sigmask_lock	0x00000004
-#define AOFF_task_sig	0x00000808
+#define AOFF_task_sig	0x000007f8
 #define ASIZ_task_sig	0x00000008
-#define AOFF_task_signal	0x00000810
+#define AOFF_task_signal	0x00000800
 #define ASIZ_task_signal	0x00000008
-#define AOFF_task_blocked	0x00000818
+#define AOFF_task_blocked	0x00000808
 #define ASIZ_task_blocked	0x00000008
-#define AOFF_task_sigqueue	0x00000820
+#define AOFF_task_sigqueue	0x00000810
 #define ASIZ_task_sigqueue	0x00000008
-#define AOFF_task_sigqueue_tail	0x00000828
+#define AOFF_task_sigqueue_tail	0x00000818
 #define ASIZ_task_sigqueue_tail	0x00000008
-#define AOFF_task_sas_ss_sp	0x00000830
+#define AOFF_task_sas_ss_sp	0x00000820
 #define ASIZ_task_sas_ss_sp	0x00000008
-#define AOFF_task_sas_ss_size	0x00000838
+#define AOFF_task_sas_ss_size	0x00000828
 #define ASIZ_task_sas_ss_size	0x00000008
-#define AOFF_task_parent_exec_id	0x00000840
+#define AOFF_task_parent_exec_id	0x00000830
 #define ASIZ_task_parent_exec_id	0x00000004
-#define AOFF_task_self_exec_id	0x00000844
+#define AOFF_task_self_exec_id	0x00000834
 #define ASIZ_task_self_exec_id	0x00000004
-#define AOFF_task_alloc_lock	0x00000848
+#define AOFF_task_alloc_lock	0x00000838
 #define ASIZ_task_alloc_lock	0x00000004
-#define ASIZ_task	0x00000850
+#define ASIZ_task	0x00000840
 #define AOFF_mm_mmap	0x00000000
 #define ASIZ_mm_mmap	0x00000008
 #define AOFF_mm_mmap_avl	0x00000008
@@ -401,96 +401,96 @@
 #define AOFF_task_it_virt_incr	0x00000168
 #define ASIZ_task_it_virt_incr	0x00000008
 #define AOFF_task_real_timer	0x00000170
-#define ASIZ_task_real_timer	0x00000030
-#define AOFF_task_times	0x000001a0
+#define ASIZ_task_real_timer	0x00000028
+#define AOFF_task_times	0x00000198
 #define ASIZ_task_times	0x00000020
-#define AOFF_task_start_time	0x000001c0
+#define AOFF_task_start_time	0x000001b8
 #define ASIZ_task_start_time	0x00000008
-#define AOFF_task_per_cpu_utime	0x000001c8
+#define AOFF_task_per_cpu_utime	0x000001c0
 #define ASIZ_task_per_cpu_utime	0x00000100
-#define AOFF_task_min_flt	0x000003c8
+#define AOFF_task_min_flt	0x000003c0
 #define ASIZ_task_min_flt	0x00000008
-#define AOFF_task_maj_flt	0x000003d0
+#define AOFF_task_maj_flt	0x000003c8
 #define ASIZ_task_maj_flt	0x00000008
-#define AOFF_task_nswap	0x000003d8
+#define AOFF_task_nswap	0x000003d0
 #define ASIZ_task_nswap	0x00000008
-#define AOFF_task_cmin_flt	0x000003e0
+#define AOFF_task_cmin_flt	0x000003d8
 #define ASIZ_task_cmin_flt	0x00000008
-#define AOFF_task_cmaj_flt	0x000003e8
+#define AOFF_task_cmaj_flt	0x000003e0
 #define ASIZ_task_cmaj_flt	0x00000008
-#define AOFF_task_cnswap	0x000003f0
+#define AOFF_task_cnswap	0x000003e8
 #define ASIZ_task_cnswap	0x00000008
-#define AOFF_task_uid	0x000003fc
+#define AOFF_task_uid	0x000003f4
 #define ASIZ_task_uid	0x00000004
-#define AOFF_task_euid	0x00000400
+#define AOFF_task_euid	0x000003f8
 #define ASIZ_task_euid	0x00000004
-#define AOFF_task_suid	0x00000404
+#define AOFF_task_suid	0x000003fc
 #define ASIZ_task_suid	0x00000004
-#define AOFF_task_fsuid	0x00000408
+#define AOFF_task_fsuid	0x00000400
 #define ASIZ_task_fsuid	0x00000004
-#define AOFF_task_gid	0x0000040c
+#define AOFF_task_gid	0x00000404
 #define ASIZ_task_gid	0x00000004
-#define AOFF_task_egid	0x00000410
+#define AOFF_task_egid	0x00000408
 #define ASIZ_task_egid	0x00000004
-#define AOFF_task_sgid	0x00000414
+#define AOFF_task_sgid	0x0000040c
 #define ASIZ_task_sgid	0x00000004
-#define AOFF_task_fsgid	0x00000418
+#define AOFF_task_fsgid	0x00000410
 #define ASIZ_task_fsgid	0x00000004
-#define AOFF_task_ngroups	0x0000041c
+#define AOFF_task_ngroups	0x00000414
 #define ASIZ_task_ngroups	0x00000004
-#define AOFF_task_groups	0x00000420
+#define AOFF_task_groups	0x00000418
 #define ASIZ_task_groups	0x00000080
-#define AOFF_task_cap_effective	0x000004a0
+#define AOFF_task_cap_effective	0x00000498
 #define ASIZ_task_cap_effective	0x00000004
-#define AOFF_task_cap_inheritable	0x000004a4
+#define AOFF_task_cap_inheritable	0x0000049c
 #define ASIZ_task_cap_inheritable	0x00000004
-#define AOFF_task_cap_permitted	0x000004a8
+#define AOFF_task_cap_permitted	0x000004a0
 #define ASIZ_task_cap_permitted	0x00000004
-#define AOFF_task_user	0x000004b0
+#define AOFF_task_user	0x000004a8
 #define ASIZ_task_user	0x00000008
-#define AOFF_task_rlim	0x000004b8
+#define AOFF_task_rlim	0x000004b0
 #define ASIZ_task_rlim	0x000000a0
-#define AOFF_task_used_math	0x00000558
+#define AOFF_task_used_math	0x00000550
 #define ASIZ_task_used_math	0x00000002
-#define AOFF_task_comm	0x0000055a
+#define AOFF_task_comm	0x00000552
 #define ASIZ_task_comm	0x00000010
-#define AOFF_task_link_count	0x0000056c
+#define AOFF_task_link_count	0x00000564
 #define ASIZ_task_link_count	0x00000004
-#define AOFF_task_tty	0x00000570
+#define AOFF_task_tty	0x00000568
 #define ASIZ_task_tty	0x00000008
-#define AOFF_task_semundo	0x00000578
+#define AOFF_task_semundo	0x00000570
 #define ASIZ_task_semundo	0x00000008
-#define AOFF_task_semsleeping	0x00000580
+#define AOFF_task_semsleeping	0x00000578
 #define ASIZ_task_semsleeping	0x00000008
-#define AOFF_task_thread	0x00000590
+#define AOFF_task_thread	0x00000580
 #define ASIZ_task_thread	0x00000450
-#define AOFF_task_fs	0x000009e0
+#define AOFF_task_fs	0x000009d0
 #define ASIZ_task_fs	0x00000008
-#define AOFF_task_files	0x000009e8
+#define AOFF_task_files	0x000009d8
 #define ASIZ_task_files	0x00000008
-#define AOFF_task_sigmask_lock	0x000009f0
+#define AOFF_task_sigmask_lock	0x000009e0
 #define ASIZ_task_sigmask_lock	0x00000001
-#define AOFF_task_sig	0x000009f8
+#define AOFF_task_sig	0x000009e8
 #define ASIZ_task_sig	0x00000008
-#define AOFF_task_signal	0x00000a00
+#define AOFF_task_signal	0x000009f0
 #define ASIZ_task_signal	0x00000008
-#define AOFF_task_blocked	0x00000a08
+#define AOFF_task_blocked	0x000009f8
 #define ASIZ_task_blocked	0x00000008
-#define AOFF_task_sigqueue	0x00000a10
+#define AOFF_task_sigqueue	0x00000a00
 #define ASIZ_task_sigqueue	0x00000008
-#define AOFF_task_sigqueue_tail	0x00000a18
+#define AOFF_task_sigqueue_tail	0x00000a08
 #define ASIZ_task_sigqueue_tail	0x00000008
-#define AOFF_task_sas_ss_sp	0x00000a20
+#define AOFF_task_sas_ss_sp	0x00000a10
 #define ASIZ_task_sas_ss_sp	0x00000008
-#define AOFF_task_sas_ss_size	0x00000a28
+#define AOFF_task_sas_ss_size	0x00000a18
 #define ASIZ_task_sas_ss_size	0x00000008
-#define AOFF_task_parent_exec_id	0x00000a30
+#define AOFF_task_parent_exec_id	0x00000a20
 #define ASIZ_task_parent_exec_id	0x00000004
-#define AOFF_task_self_exec_id	0x00000a34
+#define AOFF_task_self_exec_id	0x00000a24
 #define ASIZ_task_self_exec_id	0x00000004
-#define AOFF_task_alloc_lock	0x00000a38
+#define AOFF_task_alloc_lock	0x00000a28
 #define ASIZ_task_alloc_lock	0x00000001
-#define ASIZ_task	0x00000a40
+#define ASIZ_task	0x00000a30
 #define AOFF_mm_mmap	0x00000000
 #define ASIZ_mm_mmap	0x00000008
 #define AOFF_mm_mmap_avl	0x00000008
@@ -695,66 +695,66 @@
 #define AOFF_task_it_virt_incr	0x00000170
 #define ASIZ_task_it_virt_incr	0x00000008
 #define AOFF_task_real_timer	0x00000178
-#define ASIZ_task_real_timer	0x00000030
-#define AOFF_task_times	0x000001a8
+#define ASIZ_task_real_timer	0x00000028
+#define AOFF_task_times	0x000001a0
 #define ASIZ_task_times	0x00000020
-#define AOFF_task_start_time	0x000001c8
+#define AOFF_task_start_time	0x000001c0
 #define ASIZ_task_start_time	0x00000008
-#define AOFF_task_per_cpu_utime	0x000001d0
+#define AOFF_task_per_cpu_utime	0x000001c8
 #define ASIZ_task_per_cpu_utime	0x00000100
-#define AOFF_task_min_flt	0x000003d0
+#define AOFF_task_min_flt	0x000003c8
 #define ASIZ_task_min_flt	0x00000008
-#define AOFF_task_maj_flt	0x000003d8
+#define AOFF_task_maj_flt	0x000003d0
 #define ASIZ_task_maj_flt	0x00000008
-#define AOFF_task_nswap	0x000003e0
+#define AOFF_task_nswap	0x000003d8
 #define ASIZ_task_nswap	0x00000008
-#define AOFF_task_cmin_flt	0x000003e8
+#define AOFF_task_cmin_flt	0x000003e0
 #define ASIZ_task_cmin_flt	0x00000008
-#define AOFF_task_cmaj_flt	0x000003f0
+#define AOFF_task_cmaj_flt	0x000003e8
 #define ASIZ_task_cmaj_flt	0x00000008
-#define AOFF_task_cnswap	0x000003f8
+#define AOFF_task_cnswap	0x000003f0
 #define ASIZ_task_cnswap	0x00000008
-#define AOFF_task_uid	0x00000404
+#define AOFF_task_uid	0x000003fc
 #define ASIZ_task_uid	0x00000004
-#define AOFF_task_euid	0x00000408
+#define AOFF_task_euid	0x00000400
 #define ASIZ_task_euid	0x00000004
-#define AOFF_task_suid	0x0000040c
+#define AOFF_task_suid	0x00000404
 #define ASIZ_task_suid	0x00000004
-#define AOFF_task_fsuid	0x00000410
+#define AOFF_task_fsuid	0x00000408
 #define ASIZ_task_fsuid	0x00000004
-#define AOFF_task_gid	0x00000414
+#define AOFF_task_gid	0x0000040c
 #define ASIZ_task_gid	0x00000004
-#define AOFF_task_egid	0x00000418
+#define AOFF_task_egid	0x00000410
 #define ASIZ_task_egid	0x00000004
-#define AOFF_task_sgid	0x0000041c
+#define AOFF_task_sgid	0x00000414
 #define ASIZ_task_sgid	0x00000004
-#define AOFF_task_fsgid	0x00000420
+#define AOFF_task_fsgid	0x00000418
 #define ASIZ_task_fsgid	0x00000004
-#define AOFF_task_ngroups	0x00000424
+#define AOFF_task_ngroups	0x0000041c
 #define ASIZ_task_ngroups	0x00000004
-#define AOFF_task_groups	0x00000428
+#define AOFF_task_groups	0x00000420
 #define ASIZ_task_groups	0x00000080
-#define AOFF_task_cap_effective	0x000004a8
+#define AOFF_task_cap_effective	0x000004a0
 #define ASIZ_task_cap_effective	0x00000004
-#define AOFF_task_cap_inheritable	0x000004ac
+#define AOFF_task_cap_inheritable	0x000004a4
 #define ASIZ_task_cap_inheritable	0x00000004
-#define AOFF_task_cap_permitted	0x000004b0
+#define AOFF_task_cap_permitted	0x000004a8
 #define ASIZ_task_cap_permitted	0x00000004
-#define AOFF_task_user	0x000004b8
+#define AOFF_task_user	0x000004b0
 #define ASIZ_task_user	0x00000008
-#define AOFF_task_rlim	0x000004c0
+#define AOFF_task_rlim	0x000004b8
 #define ASIZ_task_rlim	0x000000a0
-#define AOFF_task_used_math	0x00000560
+#define AOFF_task_used_math	0x00000558
 #define ASIZ_task_used_math	0x00000002
-#define AOFF_task_comm	0x00000562
+#define AOFF_task_comm	0x0000055a
 #define ASIZ_task_comm	0x00000010
-#define AOFF_task_link_count	0x00000574
+#define AOFF_task_link_count	0x0000056c
 #define ASIZ_task_link_count	0x00000004
-#define AOFF_task_tty	0x00000578
+#define AOFF_task_tty	0x00000570
 #define ASIZ_task_tty	0x00000008
-#define AOFF_task_semundo	0x00000580
+#define AOFF_task_semundo	0x00000578
 #define ASIZ_task_semundo	0x00000008
-#define AOFF_task_semsleeping	0x00000588
+#define AOFF_task_semsleeping	0x00000580
 #define ASIZ_task_semsleeping	0x00000008
 #define AOFF_task_thread	0x00000590
 #define ASIZ_task_thread	0x00000450
diff --git a/include/asm-sparc64/bitops.h b/include/asm-sparc64/bitops.h
index 512d16410..0f42cad91 100644
--- a/include/asm-sparc64/bitops.h
+++ b/include/asm-sparc64/bitops.h
@@ -1,4 +1,4 @@
-/* $Id: bitops.h,v 1.28 2000/03/27 10:38:56 davem Exp $
+/* $Id: bitops.h,v 1.29 2000/06/30 10:18:39 davem Exp $
  * bitops.h: Bit string operations on the V9.
  *
  * Copyright 1996, 1997 David S. Miller (davem@caip.rutgers.edu)
@@ -9,9 +9,9 @@
 
 #include <asm/byteorder.h>
 
-extern long __test_and_set_bit(unsigned long nr, void *addr);
-extern long __test_and_clear_bit(unsigned long nr, void *addr);
-extern long __test_and_change_bit(unsigned long nr, void *addr);
+extern long __test_and_set_bit(unsigned long nr, volatile void *addr);
+extern long __test_and_clear_bit(unsigned long nr, volatile void *addr);
+extern long __test_and_change_bit(unsigned long nr, volatile void *addr);
 
 #define test_and_set_bit(nr,addr)	(__test_and_set_bit(nr,addr)!=0)
 #define test_and_clear_bit(nr,addr)	(__test_and_clear_bit(nr,addr)!=0)
@@ -165,8 +165,8 @@ found_middle:
 #define find_first_zero_bit(addr, size) \
         find_next_zero_bit((addr), (size), 0)
 
-extern long __test_and_set_le_bit(int nr, void *addr);
-extern long __test_and_clear_le_bit(int nr, void *addr);
+extern long __test_and_set_le_bit(int nr, volatile void *addr);
+extern long __test_and_clear_le_bit(int nr, volatile void *addr);
 
 #define test_and_set_le_bit(nr,addr)	(__test_and_set_le_bit(nr,addr)!=0)
 #define test_and_clear_le_bit(nr,addr)	(__test_and_clear_le_bit(nr,addr)!=0)
@@ -230,8 +230,9 @@ found_middle:
 #define ext2_find_next_zero_bit		find_next_zero_le_bit
 
 /* Bitmap functions for the minix filesystem.  */
-#define minix_set_bit(nr,addr) test_and_set_bit(nr,addr)
-#define minix_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
+#define minix_test_and_set_bit(nr,addr) test_and_set_bit(nr,addr)
+#define minix_set_bit(nr,addr) set_bit(nr,addr)
+#define minix_test_and_clear_bit(nr,addr) test_and_clear_bit(nr,addr)
 #define minix_test_bit(nr,addr) test_bit(nr,addr)
 #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)
 
diff --git a/include/asm-sparc64/fcntl.h b/include/asm-sparc64/fcntl.h
index cd8cc2124..8c7935dec 100644
--- a/include/asm-sparc64/fcntl.h
+++ b/include/asm-sparc64/fcntl.h
@@ -1,4 +1,4 @@
-/* $Id: fcntl.h,v 1.7 2000/01/04 23:54:58 davem Exp $ */
+/* $Id: fcntl.h,v 1.8 2000/07/06 01:41:45 davem Exp $ */
 #ifndef _SPARC64_FCNTL_H
 #define _SPARC64_FCNTL_H
 
diff --git a/include/asm-sparc64/hardirq.h b/include/asm-sparc64/hardirq.h
index 92b419aff..090239035 100644
--- a/include/asm-sparc64/hardirq.h
+++ b/include/asm-sparc64/hardirq.h
@@ -12,11 +12,12 @@
 #include <linux/spinlock.h>
 
 #ifndef CONFIG_SMP
-extern unsigned int local_irq_count;
-#define irq_enter(cpu, irq)	(local_irq_count++)
-#define irq_exit(cpu, irq)	(local_irq_count--)
+extern unsigned int __local_irq_count;
+#define local_irq_count(cpu)	__local_irq_count
+#define irq_enter(cpu, irq)	(__local_irq_count++)
+#define irq_exit(cpu, irq)	(__local_irq_count--)
 #else
-#define local_irq_count		(__brlock_array[smp_processor_id()][BR_GLOBALIRQ_LOCK])
+#define local_irq_count(cpu)	(__brlock_array[cpu][BR_GLOBALIRQ_LOCK])
 #define irq_enter(cpu, irq)	br_read_lock(BR_GLOBALIRQ_LOCK)
 #define irq_exit(cpu, irq)	br_read_unlock(BR_GLOBALIRQ_LOCK)
 #endif
@@ -25,18 +26,19 @@ extern unsigned int local_irq_count;
  * Are we in an interrupt context? Either doing bottom half
  * or hardware interrupt processing?  On any cpu?
  */
-#define in_interrupt() ((local_irq_count + local_bh_count) != 0)
+#define in_interrupt() ((local_irq_count(smp_processor_id()) + \
+		         local_bh_count(smp_processor_id())) != 0)
 
 /* This tests only the local processors hw IRQ context disposition.  */
-#define in_irq() (local_irq_count != 0)
+#define in_irq() (local_irq_count(smp_processor_id()) != 0)
 
 #ifndef CONFIG_SMP
 
-#define hardirq_trylock(cpu)	((void)(cpu), local_irq_count == 0)
+#define hardirq_trylock(cpu)	((void)(cpu), local_irq_count(smp_processor_id()) == 0)
 #define hardirq_endlock(cpu)	do { (void)(cpu); } while(0)
 
-#define hardirq_enter(cpu)	((void)(cpu), local_irq_count++)
-#define hardirq_exit(cpu)	((void)(cpu), local_irq_count--)
+#define hardirq_enter(cpu)	((void)(cpu), local_irq_count(smp_processor_id())++)
+#define hardirq_exit(cpu)	((void)(cpu), local_irq_count(smp_processor_id())--)
 
 #define synchronize_irq()	barrier()
 
diff --git a/include/asm-sparc64/softirq.h b/include/asm-sparc64/softirq.h
index 9a4f442ff..b224a279a 100644
--- a/include/asm-sparc64/softirq.h
+++ b/include/asm-sparc64/softirq.h
@@ -12,14 +12,15 @@
 #include <asm/system.h>		/* for membar() */
 
 #ifndef CONFIG_SMP
-extern unsigned int local_bh_count;
+extern unsigned int __local_bh_count;
+#define local_bh_count(cpu)	__local_bh_count
 #else
-#define local_bh_count		(cpu_data[smp_processor_id()].bh_count)
+#define local_bh_count(cpu)	(cpu_data[cpu].bh_count)
 #endif
 
-#define local_bh_disable()	(local_bh_count++)
-#define local_bh_enable()	(local_bh_count--)
+#define local_bh_disable()	(local_bh_count(smp_processor_id())++)
+#define local_bh_enable()	(local_bh_count(smp_processor_id())--)
 
-#define in_softirq() (local_bh_count != 0)
+#define in_softirq() (local_bh_count(smp_processor_id()) != 0)
 
 #endif /* !(__SPARC64_SOFTIRQ_H) */
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 262d5ea37..5610b7fe2 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -177,7 +177,7 @@ extern int * max_sectors[MAX_BLKDEV];
 
 extern int * max_segments[MAX_BLKDEV];
 
-#define MAX_SECTORS 128
+#define MAX_SECTORS 254
 
 #define MAX_SEGMENTS MAX_SECTORS
 
diff --git a/include/linux/umsdos_fs.p b/include/linux/umsdos_fs.p
index 677bee22e..93ad4d11d 100644
--- a/include/linux/umsdos_fs.p
+++ b/include/linux/umsdos_fs.p
@@ -17,26 +17,10 @@ struct dentry *umsdos_covered(struct dentry *, char *, int);
 struct dentry *umsdos_solve_hlink (struct dentry *hlink);
 
 /* emd.c 22/06/95 00.22.04 */
-ssize_t umsdos_file_write_kmem_real (struct file *filp,
-				const char *buf,
-				size_t  count);
-
-ssize_t umsdos_file_read_kmem (struct file *filp,
-	 char *buf,
-	 size_t count);
-ssize_t umsdos_file_write_kmem (struct file *filp,
-	 const char *buf,
-	 size_t count);
-ssize_t umsdos_emd_dir_write (struct file *filp,
-	 char *buf,
-	 size_t count);
-ssize_t umsdos_emd_dir_read (struct file *filp,
-	 char *buf,
-	 size_t count);
 struct dentry *umsdos_get_emd_dentry(struct dentry *);
 int umsdos_have_emd(struct dentry *);
 int umsdos_make_emd(struct dentry *);
-int umsdos_emd_dir_readentry (struct file *, struct umsdos_dirent *);
+int umsdos_emd_dir_readentry (struct dentry *, loff_t *, struct umsdos_dirent *);
 int umsdos_newentry (struct dentry *, struct umsdos_info *);
 int umsdos_newhidden (struct dentry *, struct umsdos_info *);
 int umsdos_delentry (struct dentry *, struct umsdos_info *, int);
diff --git a/include/linux/umsdos_fs_i.h b/include/linux/umsdos_fs_i.h
index e123efb10..0edfb1d54 100644
--- a/include/linux/umsdos_fs_i.h
+++ b/include/linux/umsdos_fs_i.h
@@ -21,13 +21,9 @@
  * So we duplicate the msdos_inode_info, and add our own info at the
  * end.
  * 
- * For all file type (and directory) the inode has a reference to:
- * the directory which hold this entry: i_dir_owner
- * The EMD file of i_dir_owner: i_emd_owner
  * The offset in this EMD file of the entry: pos
  * 
- * For directory, we also have a reference to the inode of its
- * own EMD file. Also, we have dir_locking_info to help synchronise
+ * For directory, we have dir_locking_info to help synchronise
  * file creation and file lookup. See also msdos_fs_i.h for more 
  * information about msdos_inode_info.
  * 
@@ -56,11 +52,7 @@ struct umsdos_inode_info {
 	struct dir_locking_info dir_info;
 	int i_patched;			/* Inode has been patched */
 	int i_is_hlink;			/* Resolved hardlink inode? */
-	unsigned long i_emd_owner;	/* Is this the EMD file inode? */
 	off_t pos;			/* Entry offset in the emd_owner file */
-	/* The rest is used only if this inode describes a directory */
-	struct dentry *i_emd_dentry;	/* EMD dentry for this directory */
-	unsigned long i_emd_dir;	/* Inode of the EMD file */
 };
 
 #endif
diff --git a/include/net/slhc_vj.h b/include/net/slhc_vj.h
index 04387d8a8..0a85dc014 100644
--- a/include/net/slhc_vj.h
+++ b/include/net/slhc_vj.h
@@ -80,6 +80,10 @@
  * means "IP packet".
  */
 
+
+#include <linux/ip.h>
+#include <linux/tcp.h>
+
 /* SLIP compression masks for len/vers byte */
 #define SL_TYPE_IP 0x40
 #define SL_TYPE_UNCOMPRESSED_TCP 0x70