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

-Werror clean.

6 files changed, 110 insertions, 104 deletions

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 */