Merge with Linux 2.4.0-test5-pre1. This works again on Origin UP.

The IP22 cache bugs which are plaguing some machines are still unfixed.

3 files changed, 236 insertions, 235 deletions

diff --git a/include/asm-sparc64/asm_offsets.h b/include/asm-sparc64/asm_offsets.h
index 421814863..e191ef259 100644
--- a/include/asm-sparc64/asm_offsets.h
+++ b/include/asm-sparc64/asm_offsets.h
@@ -85,114 +85,114 @@
 #define AOFF_task_pidhash_pprev	0x000000f8
 #define ASIZ_task_pidhash_pprev	0x00000008
 #define AOFF_task_wait_chldexit	0x00000100
-#define ASIZ_task_wait_chldexit	0x00000028
-#define AOFF_task_vfork_sem	0x00000128
+#define ASIZ_task_wait_chldexit	0x00000018
+#define AOFF_task_vfork_sem	0x00000118
 #define ASIZ_task_vfork_sem	0x00000008
-#define AOFF_task_rt_priority	0x00000130
+#define AOFF_task_rt_priority	0x00000120
 #define ASIZ_task_rt_priority	0x00000008
-#define AOFF_task_it_real_value	0x00000138
+#define AOFF_task_it_real_value	0x00000128
 #define ASIZ_task_it_real_value	0x00000008
-#define AOFF_task_it_prof_value	0x00000140
+#define AOFF_task_it_prof_value	0x00000130
 #define ASIZ_task_it_prof_value	0x00000008
-#define AOFF_task_it_virt_value	0x00000148
+#define AOFF_task_it_virt_value	0x00000138
 #define ASIZ_task_it_virt_value	0x00000008
-#define AOFF_task_it_real_incr	0x00000150
+#define AOFF_task_it_real_incr	0x00000140
 #define ASIZ_task_it_real_incr	0x00000008
-#define AOFF_task_it_prof_incr	0x00000158
+#define AOFF_task_it_prof_incr	0x00000148
 #define ASIZ_task_it_prof_incr	0x00000008
-#define AOFF_task_it_virt_incr	0x00000160
+#define AOFF_task_it_virt_incr	0x00000150
 #define ASIZ_task_it_virt_incr	0x00000008
-#define AOFF_task_real_timer	0x00000168
+#define AOFF_task_real_timer	0x00000158
 #define ASIZ_task_real_timer	0x00000028
-#define AOFF_task_times	0x00000190
+#define AOFF_task_times	0x00000180
 #define ASIZ_task_times	0x00000020
-#define AOFF_task_start_time	0x000001b0
+#define AOFF_task_start_time	0x000001a0
 #define ASIZ_task_start_time	0x00000008
-#define AOFF_task_per_cpu_utime	0x000001b8
+#define AOFF_task_per_cpu_utime	0x000001a8
 #define ASIZ_task_per_cpu_utime	0x00000008
-#define AOFF_task_min_flt	0x000001c8
+#define AOFF_task_min_flt	0x000001b8
 #define ASIZ_task_min_flt	0x00000008
-#define AOFF_task_maj_flt	0x000001d0
+#define AOFF_task_maj_flt	0x000001c0
 #define ASIZ_task_maj_flt	0x00000008
-#define AOFF_task_nswap	0x000001d8
+#define AOFF_task_nswap	0x000001c8
 #define ASIZ_task_nswap	0x00000008
-#define AOFF_task_cmin_flt	0x000001e0
+#define AOFF_task_cmin_flt	0x000001d0
 #define ASIZ_task_cmin_flt	0x00000008
-#define AOFF_task_cmaj_flt	0x000001e8
+#define AOFF_task_cmaj_flt	0x000001d8
 #define ASIZ_task_cmaj_flt	0x00000008
-#define AOFF_task_cnswap	0x000001f0
+#define AOFF_task_cnswap	0x000001e0
 #define ASIZ_task_cnswap	0x00000008
-#define AOFF_task_uid	0x000001fc
+#define AOFF_task_uid	0x000001ec
 #define ASIZ_task_uid	0x00000004
-#define AOFF_task_euid	0x00000200
+#define AOFF_task_euid	0x000001f0
 #define ASIZ_task_euid	0x00000004
-#define AOFF_task_suid	0x00000204
+#define AOFF_task_suid	0x000001f4
 #define ASIZ_task_suid	0x00000004
-#define AOFF_task_fsuid	0x00000208
+#define AOFF_task_fsuid	0x000001f8
 #define ASIZ_task_fsuid	0x00000004
-#define AOFF_task_gid	0x0000020c
+#define AOFF_task_gid	0x000001fc
 #define ASIZ_task_gid	0x00000004
-#define AOFF_task_egid	0x00000210
+#define AOFF_task_egid	0x00000200
 #define ASIZ_task_egid	0x00000004
-#define AOFF_task_sgid	0x00000214
+#define AOFF_task_sgid	0x00000204
 #define ASIZ_task_sgid	0x00000004
-#define AOFF_task_fsgid	0x00000218
+#define AOFF_task_fsgid	0x00000208
 #define ASIZ_task_fsgid	0x00000004
-#define AOFF_task_ngroups	0x0000021c
+#define AOFF_task_ngroups	0x0000020c
 #define ASIZ_task_ngroups	0x00000004
-#define AOFF_task_groups	0x00000220
+#define AOFF_task_groups	0x00000210
 #define ASIZ_task_groups	0x00000080
-#define AOFF_task_cap_effective	0x000002a0
+#define AOFF_task_cap_effective	0x00000290
 #define ASIZ_task_cap_effective	0x00000004
-#define AOFF_task_cap_inheritable	0x000002a4
+#define AOFF_task_cap_inheritable	0x00000294
 #define ASIZ_task_cap_inheritable	0x00000004
-#define AOFF_task_cap_permitted	0x000002a8
+#define AOFF_task_cap_permitted	0x00000298
 #define ASIZ_task_cap_permitted	0x00000004
-#define AOFF_task_user	0x000002b0
+#define AOFF_task_user	0x000002a0
 #define ASIZ_task_user	0x00000008
-#define AOFF_task_rlim	0x000002b8
+#define AOFF_task_rlim	0x000002a8
 #define ASIZ_task_rlim	0x000000a0
-#define AOFF_task_used_math	0x00000358
+#define AOFF_task_used_math	0x00000348
 #define ASIZ_task_used_math	0x00000002
-#define AOFF_task_comm	0x0000035a
+#define AOFF_task_comm	0x0000034a
 #define ASIZ_task_comm	0x00000010
-#define AOFF_task_link_count	0x0000036c
+#define AOFF_task_link_count	0x0000035c
 #define ASIZ_task_link_count	0x00000004
-#define AOFF_task_tty	0x00000370
+#define AOFF_task_tty	0x00000360
 #define ASIZ_task_tty	0x00000008
-#define AOFF_task_semundo	0x00000378
+#define AOFF_task_semundo	0x00000368
 #define ASIZ_task_semundo	0x00000008
-#define AOFF_task_semsleeping	0x00000380
+#define AOFF_task_semsleeping	0x00000370
 #define ASIZ_task_semsleeping	0x00000008
-#define AOFF_task_thread	0x00000390
+#define AOFF_task_thread	0x00000380
 #define ASIZ_task_thread	0x00000450
-#define AOFF_task_fs	0x000007e0
+#define AOFF_task_fs	0x000007d0
 #define ASIZ_task_fs	0x00000008
-#define AOFF_task_files	0x000007e8
+#define AOFF_task_files	0x000007d8
 #define ASIZ_task_files	0x00000008
-#define AOFF_task_sigmask_lock	0x000007f0
+#define AOFF_task_sigmask_lock	0x000007e0
 #define ASIZ_task_sigmask_lock	0x00000004
-#define AOFF_task_sig	0x000007f8
+#define AOFF_task_sig	0x000007e8
 #define ASIZ_task_sig	0x00000008
-#define AOFF_task_signal	0x00000800
+#define AOFF_task_signal	0x000007f0
 #define ASIZ_task_signal	0x00000008
-#define AOFF_task_blocked	0x00000808
+#define AOFF_task_blocked	0x000007f8
 #define ASIZ_task_blocked	0x00000008
-#define AOFF_task_sigqueue	0x00000810
+#define AOFF_task_sigqueue	0x00000800
 #define ASIZ_task_sigqueue	0x00000008
-#define AOFF_task_sigqueue_tail	0x00000818
+#define AOFF_task_sigqueue_tail	0x00000808
 #define ASIZ_task_sigqueue_tail	0x00000008
-#define AOFF_task_sas_ss_sp	0x00000820
+#define AOFF_task_sas_ss_sp	0x00000810
 #define ASIZ_task_sas_ss_sp	0x00000008
-#define AOFF_task_sas_ss_size	0x00000828
+#define AOFF_task_sas_ss_size	0x00000818
 #define ASIZ_task_sas_ss_size	0x00000008
-#define AOFF_task_parent_exec_id	0x00000830
+#define AOFF_task_parent_exec_id	0x00000820
 #define ASIZ_task_parent_exec_id	0x00000004
-#define AOFF_task_self_exec_id	0x00000834
+#define AOFF_task_self_exec_id	0x00000824
 #define ASIZ_task_self_exec_id	0x00000004
-#define AOFF_task_alloc_lock	0x00000838
+#define AOFF_task_alloc_lock	0x00000828
 #define ASIZ_task_alloc_lock	0x00000004
-#define ASIZ_task	0x00000840
+#define ASIZ_task	0x00000830
 #define AOFF_mm_mmap	0x00000000
 #define ASIZ_mm_mmap	0x00000008
 #define AOFF_mm_mmap_avl	0x00000008
@@ -208,50 +208,50 @@
 #define AOFF_mm_map_count	0x00000028
 #define ASIZ_mm_map_count	0x00000004
 #define AOFF_mm_mmap_sem	0x00000030
-#define ASIZ_mm_mmap_sem	0x00000038
-#define AOFF_mm_page_table_lock	0x00000068
+#define ASIZ_mm_mmap_sem	0x00000020
+#define AOFF_mm_page_table_lock	0x00000050
 #define ASIZ_mm_page_table_lock	0x00000004
-#define AOFF_mm_context	0x00000070
+#define AOFF_mm_context	0x00000058
 #define ASIZ_mm_context	0x00000008
-#define AOFF_mm_start_code	0x00000078
+#define AOFF_mm_start_code	0x00000060
 #define ASIZ_mm_start_code	0x00000008
-#define AOFF_mm_end_code	0x00000080
+#define AOFF_mm_end_code	0x00000068
 #define ASIZ_mm_end_code	0x00000008
-#define AOFF_mm_start_data	0x00000088
+#define AOFF_mm_start_data	0x00000070
 #define ASIZ_mm_start_data	0x00000008
-#define AOFF_mm_end_data	0x00000090
+#define AOFF_mm_end_data	0x00000078
 #define ASIZ_mm_end_data	0x00000008
-#define AOFF_mm_start_brk	0x00000098
+#define AOFF_mm_start_brk	0x00000080
 #define ASIZ_mm_start_brk	0x00000008
-#define AOFF_mm_brk	0x000000a0
+#define AOFF_mm_brk	0x00000088
 #define ASIZ_mm_brk	0x00000008
-#define AOFF_mm_start_stack	0x000000a8
+#define AOFF_mm_start_stack	0x00000090
 #define ASIZ_mm_start_stack	0x00000008
-#define AOFF_mm_arg_start	0x000000b0
+#define AOFF_mm_arg_start	0x00000098
 #define ASIZ_mm_arg_start	0x00000008
-#define AOFF_mm_arg_end	0x000000b8
+#define AOFF_mm_arg_end	0x000000a0
 #define ASIZ_mm_arg_end	0x00000008
-#define AOFF_mm_env_start	0x000000c0
+#define AOFF_mm_env_start	0x000000a8
 #define ASIZ_mm_env_start	0x00000008
-#define AOFF_mm_env_end	0x000000c8
+#define AOFF_mm_env_end	0x000000b0
 #define ASIZ_mm_env_end	0x00000008
-#define AOFF_mm_rss	0x000000d0
+#define AOFF_mm_rss	0x000000b8
 #define ASIZ_mm_rss	0x00000008
-#define AOFF_mm_total_vm	0x000000d8
+#define AOFF_mm_total_vm	0x000000c0
 #define ASIZ_mm_total_vm	0x00000008
-#define AOFF_mm_locked_vm	0x000000e0
+#define AOFF_mm_locked_vm	0x000000c8
 #define ASIZ_mm_locked_vm	0x00000008
-#define AOFF_mm_def_flags	0x000000e8
+#define AOFF_mm_def_flags	0x000000d0
 #define ASIZ_mm_def_flags	0x00000008
-#define AOFF_mm_cpu_vm_mask	0x000000f0
+#define AOFF_mm_cpu_vm_mask	0x000000d8
 #define ASIZ_mm_cpu_vm_mask	0x00000008
-#define AOFF_mm_swap_cnt	0x000000f8
+#define AOFF_mm_swap_cnt	0x000000e0
 #define ASIZ_mm_swap_cnt	0x00000008
-#define AOFF_mm_swap_address	0x00000100
+#define AOFF_mm_swap_address	0x000000e8
 #define ASIZ_mm_swap_address	0x00000008
-#define AOFF_mm_segments	0x00000108
+#define AOFF_mm_segments	0x000000f0
 #define ASIZ_mm_segments	0x00000008
-#define ASIZ_mm	0x00000110
+#define ASIZ_mm	0x000000f8
 #define AOFF_thread_ksp	0x00000000
 #define ASIZ_thread_ksp	0x00000008
 #define AOFF_thread_wstate	0x00000008
@@ -379,114 +379,114 @@
 #define AOFF_task_pidhash_pprev	0x000000f8
 #define ASIZ_task_pidhash_pprev	0x00000008
 #define AOFF_task_wait_chldexit	0x00000100
-#define ASIZ_task_wait_chldexit	0x00000028
-#define AOFF_task_vfork_sem	0x00000128
+#define ASIZ_task_wait_chldexit	0x00000018
+#define AOFF_task_vfork_sem	0x00000118
 #define ASIZ_task_vfork_sem	0x00000008
-#define AOFF_task_rt_priority	0x00000130
+#define AOFF_task_rt_priority	0x00000120
 #define ASIZ_task_rt_priority	0x00000008
-#define AOFF_task_it_real_value	0x00000138
+#define AOFF_task_it_real_value	0x00000128
 #define ASIZ_task_it_real_value	0x00000008
-#define AOFF_task_it_prof_value	0x00000140
+#define AOFF_task_it_prof_value	0x00000130
 #define ASIZ_task_it_prof_value	0x00000008
-#define AOFF_task_it_virt_value	0x00000148
+#define AOFF_task_it_virt_value	0x00000138
 #define ASIZ_task_it_virt_value	0x00000008
-#define AOFF_task_it_real_incr	0x00000150
+#define AOFF_task_it_real_incr	0x00000140
 #define ASIZ_task_it_real_incr	0x00000008
-#define AOFF_task_it_prof_incr	0x00000158
+#define AOFF_task_it_prof_incr	0x00000148
 #define ASIZ_task_it_prof_incr	0x00000008
-#define AOFF_task_it_virt_incr	0x00000160
+#define AOFF_task_it_virt_incr	0x00000150
 #define ASIZ_task_it_virt_incr	0x00000008
-#define AOFF_task_real_timer	0x00000168
+#define AOFF_task_real_timer	0x00000158
 #define ASIZ_task_real_timer	0x00000028
-#define AOFF_task_times	0x00000190
+#define AOFF_task_times	0x00000180
 #define ASIZ_task_times	0x00000020
-#define AOFF_task_start_time	0x000001b0
+#define AOFF_task_start_time	0x000001a0
 #define ASIZ_task_start_time	0x00000008
-#define AOFF_task_per_cpu_utime	0x000001b8
+#define AOFF_task_per_cpu_utime	0x000001a8
 #define ASIZ_task_per_cpu_utime	0x00000100
-#define AOFF_task_min_flt	0x000003b8
+#define AOFF_task_min_flt	0x000003a8
 #define ASIZ_task_min_flt	0x00000008
-#define AOFF_task_maj_flt	0x000003c0
+#define AOFF_task_maj_flt	0x000003b0
 #define ASIZ_task_maj_flt	0x00000008
-#define AOFF_task_nswap	0x000003c8
+#define AOFF_task_nswap	0x000003b8
 #define ASIZ_task_nswap	0x00000008
-#define AOFF_task_cmin_flt	0x000003d0
+#define AOFF_task_cmin_flt	0x000003c0
 #define ASIZ_task_cmin_flt	0x00000008
-#define AOFF_task_cmaj_flt	0x000003d8
+#define AOFF_task_cmaj_flt	0x000003c8
 #define ASIZ_task_cmaj_flt	0x00000008
-#define AOFF_task_cnswap	0x000003e0
+#define AOFF_task_cnswap	0x000003d0
 #define ASIZ_task_cnswap	0x00000008
-#define AOFF_task_uid	0x000003ec
+#define AOFF_task_uid	0x000003dc
 #define ASIZ_task_uid	0x00000004
-#define AOFF_task_euid	0x000003f0
+#define AOFF_task_euid	0x000003e0
 #define ASIZ_task_euid	0x00000004
-#define AOFF_task_suid	0x000003f4
+#define AOFF_task_suid	0x000003e4
 #define ASIZ_task_suid	0x00000004
-#define AOFF_task_fsuid	0x000003f8
+#define AOFF_task_fsuid	0x000003e8
 #define ASIZ_task_fsuid	0x00000004
-#define AOFF_task_gid	0x000003fc
+#define AOFF_task_gid	0x000003ec
 #define ASIZ_task_gid	0x00000004
-#define AOFF_task_egid	0x00000400
+#define AOFF_task_egid	0x000003f0
 #define ASIZ_task_egid	0x00000004
-#define AOFF_task_sgid	0x00000404
+#define AOFF_task_sgid	0x000003f4
 #define ASIZ_task_sgid	0x00000004
-#define AOFF_task_fsgid	0x00000408
+#define AOFF_task_fsgid	0x000003f8
 #define ASIZ_task_fsgid	0x00000004
-#define AOFF_task_ngroups	0x0000040c
+#define AOFF_task_ngroups	0x000003fc
 #define ASIZ_task_ngroups	0x00000004
-#define AOFF_task_groups	0x00000410
+#define AOFF_task_groups	0x00000400
 #define ASIZ_task_groups	0x00000080
-#define AOFF_task_cap_effective	0x00000490
+#define AOFF_task_cap_effective	0x00000480
 #define ASIZ_task_cap_effective	0x00000004
-#define AOFF_task_cap_inheritable	0x00000494
+#define AOFF_task_cap_inheritable	0x00000484
 #define ASIZ_task_cap_inheritable	0x00000004
-#define AOFF_task_cap_permitted	0x00000498
+#define AOFF_task_cap_permitted	0x00000488
 #define ASIZ_task_cap_permitted	0x00000004
-#define AOFF_task_user	0x000004a0
+#define AOFF_task_user	0x00000490
 #define ASIZ_task_user	0x00000008
-#define AOFF_task_rlim	0x000004a8
+#define AOFF_task_rlim	0x00000498
 #define ASIZ_task_rlim	0x000000a0
-#define AOFF_task_used_math	0x00000548
+#define AOFF_task_used_math	0x00000538
 #define ASIZ_task_used_math	0x00000002
-#define AOFF_task_comm	0x0000054a
+#define AOFF_task_comm	0x0000053a
 #define ASIZ_task_comm	0x00000010
-#define AOFF_task_link_count	0x0000055c
+#define AOFF_task_link_count	0x0000054c
 #define ASIZ_task_link_count	0x00000004
-#define AOFF_task_tty	0x00000560
+#define AOFF_task_tty	0x00000550
 #define ASIZ_task_tty	0x00000008
-#define AOFF_task_semundo	0x00000568
+#define AOFF_task_semundo	0x00000558
 #define ASIZ_task_semundo	0x00000008
-#define AOFF_task_semsleeping	0x00000570
+#define AOFF_task_semsleeping	0x00000560
 #define ASIZ_task_semsleeping	0x00000008
-#define AOFF_task_thread	0x00000580
+#define AOFF_task_thread	0x00000570
 #define ASIZ_task_thread	0x00000450
-#define AOFF_task_fs	0x000009d0
+#define AOFF_task_fs	0x000009c0
 #define ASIZ_task_fs	0x00000008
-#define AOFF_task_files	0x000009d8
+#define AOFF_task_files	0x000009c8
 #define ASIZ_task_files	0x00000008
-#define AOFF_task_sigmask_lock	0x000009e0
+#define AOFF_task_sigmask_lock	0x000009d0
 #define ASIZ_task_sigmask_lock	0x00000001
-#define AOFF_task_sig	0x000009e8
+#define AOFF_task_sig	0x000009d8
 #define ASIZ_task_sig	0x00000008
-#define AOFF_task_signal	0x000009f0
+#define AOFF_task_signal	0x000009e0
 #define ASIZ_task_signal	0x00000008
-#define AOFF_task_blocked	0x000009f8
+#define AOFF_task_blocked	0x000009e8
 #define ASIZ_task_blocked	0x00000008
-#define AOFF_task_sigqueue	0x00000a00
+#define AOFF_task_sigqueue	0x000009f0
 #define ASIZ_task_sigqueue	0x00000008
-#define AOFF_task_sigqueue_tail	0x00000a08
+#define AOFF_task_sigqueue_tail	0x000009f8
 #define ASIZ_task_sigqueue_tail	0x00000008
-#define AOFF_task_sas_ss_sp	0x00000a10
+#define AOFF_task_sas_ss_sp	0x00000a00
 #define ASIZ_task_sas_ss_sp	0x00000008
-#define AOFF_task_sas_ss_size	0x00000a18
+#define AOFF_task_sas_ss_size	0x00000a08
 #define ASIZ_task_sas_ss_size	0x00000008
-#define AOFF_task_parent_exec_id	0x00000a20
+#define AOFF_task_parent_exec_id	0x00000a10
 #define ASIZ_task_parent_exec_id	0x00000004
-#define AOFF_task_self_exec_id	0x00000a24
+#define AOFF_task_self_exec_id	0x00000a14
 #define ASIZ_task_self_exec_id	0x00000004
-#define AOFF_task_alloc_lock	0x00000a28
+#define AOFF_task_alloc_lock	0x00000a18
 #define ASIZ_task_alloc_lock	0x00000001
-#define ASIZ_task	0x00000a30
+#define ASIZ_task	0x00000a20
 #define AOFF_mm_mmap	0x00000000
 #define ASIZ_mm_mmap	0x00000008
 #define AOFF_mm_mmap_avl	0x00000008
@@ -502,50 +502,50 @@
 #define AOFF_mm_map_count	0x00000028
 #define ASIZ_mm_map_count	0x00000004
 #define AOFF_mm_mmap_sem	0x00000030
-#define ASIZ_mm_mmap_sem	0x00000038
-#define AOFF_mm_page_table_lock	0x00000068
+#define ASIZ_mm_mmap_sem	0x00000020
+#define AOFF_mm_page_table_lock	0x00000050
 #define ASIZ_mm_page_table_lock	0x00000001
-#define AOFF_mm_context	0x00000070
+#define AOFF_mm_context	0x00000058
 #define ASIZ_mm_context	0x00000008
-#define AOFF_mm_start_code	0x00000078
+#define AOFF_mm_start_code	0x00000060
 #define ASIZ_mm_start_code	0x00000008
-#define AOFF_mm_end_code	0x00000080
+#define AOFF_mm_end_code	0x00000068
 #define ASIZ_mm_end_code	0x00000008
-#define AOFF_mm_start_data	0x00000088
+#define AOFF_mm_start_data	0x00000070
 #define ASIZ_mm_start_data	0x00000008
-#define AOFF_mm_end_data	0x00000090
+#define AOFF_mm_end_data	0x00000078
 #define ASIZ_mm_end_data	0x00000008
-#define AOFF_mm_start_brk	0x00000098
+#define AOFF_mm_start_brk	0x00000080
 #define ASIZ_mm_start_brk	0x00000008
-#define AOFF_mm_brk	0x000000a0
+#define AOFF_mm_brk	0x00000088
 #define ASIZ_mm_brk	0x00000008
-#define AOFF_mm_start_stack	0x000000a8
+#define AOFF_mm_start_stack	0x00000090
 #define ASIZ_mm_start_stack	0x00000008
-#define AOFF_mm_arg_start	0x000000b0
+#define AOFF_mm_arg_start	0x00000098
 #define ASIZ_mm_arg_start	0x00000008
-#define AOFF_mm_arg_end	0x000000b8
+#define AOFF_mm_arg_end	0x000000a0
 #define ASIZ_mm_arg_end	0x00000008
-#define AOFF_mm_env_start	0x000000c0
+#define AOFF_mm_env_start	0x000000a8
 #define ASIZ_mm_env_start	0x00000008
-#define AOFF_mm_env_end	0x000000c8
+#define AOFF_mm_env_end	0x000000b0
 #define ASIZ_mm_env_end	0x00000008
-#define AOFF_mm_rss	0x000000d0
+#define AOFF_mm_rss	0x000000b8
 #define ASIZ_mm_rss	0x00000008
-#define AOFF_mm_total_vm	0x000000d8
+#define AOFF_mm_total_vm	0x000000c0
 #define ASIZ_mm_total_vm	0x00000008
-#define AOFF_mm_locked_vm	0x000000e0
+#define AOFF_mm_locked_vm	0x000000c8
 #define ASIZ_mm_locked_vm	0x00000008
-#define AOFF_mm_def_flags	0x000000e8
+#define AOFF_mm_def_flags	0x000000d0
 #define ASIZ_mm_def_flags	0x00000008
-#define AOFF_mm_cpu_vm_mask	0x000000f0
+#define AOFF_mm_cpu_vm_mask	0x000000d8
 #define ASIZ_mm_cpu_vm_mask	0x00000008
-#define AOFF_mm_swap_cnt	0x000000f8
+#define AOFF_mm_swap_cnt	0x000000e0
 #define ASIZ_mm_swap_cnt	0x00000008
-#define AOFF_mm_swap_address	0x00000100
+#define AOFF_mm_swap_address	0x000000e8
 #define ASIZ_mm_swap_address	0x00000008
-#define AOFF_mm_segments	0x00000108
+#define AOFF_mm_segments	0x000000f0
 #define ASIZ_mm_segments	0x00000008
-#define ASIZ_mm	0x00000110
+#define ASIZ_mm	0x000000f8
 #define AOFF_thread_ksp	0x00000000
 #define ASIZ_thread_ksp	0x00000008
 #define AOFF_thread_wstate	0x00000008
@@ -671,114 +671,114 @@
 #define AOFF_task_pidhash_pprev	0x000000f8
 #define ASIZ_task_pidhash_pprev	0x00000008
 #define AOFF_task_wait_chldexit	0x00000100
-#define ASIZ_task_wait_chldexit	0x00000030
-#define AOFF_task_vfork_sem	0x00000130
+#define ASIZ_task_wait_chldexit	0x00000020
+#define AOFF_task_vfork_sem	0x00000120
 #define ASIZ_task_vfork_sem	0x00000008
-#define AOFF_task_rt_priority	0x00000138
+#define AOFF_task_rt_priority	0x00000128
 #define ASIZ_task_rt_priority	0x00000008
-#define AOFF_task_it_real_value	0x00000140
+#define AOFF_task_it_real_value	0x00000130
 #define ASIZ_task_it_real_value	0x00000008
-#define AOFF_task_it_prof_value	0x00000148
+#define AOFF_task_it_prof_value	0x00000138
 #define ASIZ_task_it_prof_value	0x00000008
-#define AOFF_task_it_virt_value	0x00000150
+#define AOFF_task_it_virt_value	0x00000140
 #define ASIZ_task_it_virt_value	0x00000008
-#define AOFF_task_it_real_incr	0x00000158
+#define AOFF_task_it_real_incr	0x00000148
 #define ASIZ_task_it_real_incr	0x00000008
-#define AOFF_task_it_prof_incr	0x00000160
+#define AOFF_task_it_prof_incr	0x00000150
 #define ASIZ_task_it_prof_incr	0x00000008
-#define AOFF_task_it_virt_incr	0x00000168
+#define AOFF_task_it_virt_incr	0x00000158
 #define ASIZ_task_it_virt_incr	0x00000008
-#define AOFF_task_real_timer	0x00000170
+#define AOFF_task_real_timer	0x00000160
 #define ASIZ_task_real_timer	0x00000028
-#define AOFF_task_times	0x00000198
+#define AOFF_task_times	0x00000188
 #define ASIZ_task_times	0x00000020
-#define AOFF_task_start_time	0x000001b8
+#define AOFF_task_start_time	0x000001a8
 #define ASIZ_task_start_time	0x00000008
-#define AOFF_task_per_cpu_utime	0x000001c0
+#define AOFF_task_per_cpu_utime	0x000001b0
 #define ASIZ_task_per_cpu_utime	0x00000100
-#define AOFF_task_min_flt	0x000003c0
+#define AOFF_task_min_flt	0x000003b0
 #define ASIZ_task_min_flt	0x00000008
-#define AOFF_task_maj_flt	0x000003c8
+#define AOFF_task_maj_flt	0x000003b8
 #define ASIZ_task_maj_flt	0x00000008
-#define AOFF_task_nswap	0x000003d0
+#define AOFF_task_nswap	0x000003c0
 #define ASIZ_task_nswap	0x00000008
-#define AOFF_task_cmin_flt	0x000003d8
+#define AOFF_task_cmin_flt	0x000003c8
 #define ASIZ_task_cmin_flt	0x00000008
-#define AOFF_task_cmaj_flt	0x000003e0
+#define AOFF_task_cmaj_flt	0x000003d0
 #define ASIZ_task_cmaj_flt	0x00000008
-#define AOFF_task_cnswap	0x000003e8
+#define AOFF_task_cnswap	0x000003d8
 #define ASIZ_task_cnswap	0x00000008
-#define AOFF_task_uid	0x000003f4
+#define AOFF_task_uid	0x000003e4
 #define ASIZ_task_uid	0x00000004
-#define AOFF_task_euid	0x000003f8
+#define AOFF_task_euid	0x000003e8
 #define ASIZ_task_euid	0x00000004
-#define AOFF_task_suid	0x000003fc
+#define AOFF_task_suid	0x000003ec
 #define ASIZ_task_suid	0x00000004
-#define AOFF_task_fsuid	0x00000400
+#define AOFF_task_fsuid	0x000003f0
 #define ASIZ_task_fsuid	0x00000004
-#define AOFF_task_gid	0x00000404
+#define AOFF_task_gid	0x000003f4
 #define ASIZ_task_gid	0x00000004
-#define AOFF_task_egid	0x00000408
+#define AOFF_task_egid	0x000003f8
 #define ASIZ_task_egid	0x00000004
-#define AOFF_task_sgid	0x0000040c
+#define AOFF_task_sgid	0x000003fc
 #define ASIZ_task_sgid	0x00000004
-#define AOFF_task_fsgid	0x00000410
+#define AOFF_task_fsgid	0x00000400
 #define ASIZ_task_fsgid	0x00000004
-#define AOFF_task_ngroups	0x00000414
+#define AOFF_task_ngroups	0x00000404
 #define ASIZ_task_ngroups	0x00000004
-#define AOFF_task_groups	0x00000418
+#define AOFF_task_groups	0x00000408
 #define ASIZ_task_groups	0x00000080
-#define AOFF_task_cap_effective	0x00000498
+#define AOFF_task_cap_effective	0x00000488
 #define ASIZ_task_cap_effective	0x00000004
-#define AOFF_task_cap_inheritable	0x0000049c
+#define AOFF_task_cap_inheritable	0x0000048c
 #define ASIZ_task_cap_inheritable	0x00000004
-#define AOFF_task_cap_permitted	0x000004a0
+#define AOFF_task_cap_permitted	0x00000490
 #define ASIZ_task_cap_permitted	0x00000004
-#define AOFF_task_user	0x000004a8
+#define AOFF_task_user	0x00000498
 #define ASIZ_task_user	0x00000008
-#define AOFF_task_rlim	0x000004b0
+#define AOFF_task_rlim	0x000004a0
 #define ASIZ_task_rlim	0x000000a0
-#define AOFF_task_used_math	0x00000550
+#define AOFF_task_used_math	0x00000540
 #define ASIZ_task_used_math	0x00000002
-#define AOFF_task_comm	0x00000552
+#define AOFF_task_comm	0x00000542
 #define ASIZ_task_comm	0x00000010
-#define AOFF_task_link_count	0x00000564
+#define AOFF_task_link_count	0x00000554
 #define ASIZ_task_link_count	0x00000004
-#define AOFF_task_tty	0x00000568
+#define AOFF_task_tty	0x00000558
 #define ASIZ_task_tty	0x00000008
-#define AOFF_task_semundo	0x00000570
+#define AOFF_task_semundo	0x00000560
 #define ASIZ_task_semundo	0x00000008
-#define AOFF_task_semsleeping	0x00000578
+#define AOFF_task_semsleeping	0x00000568
 #define ASIZ_task_semsleeping	0x00000008
-#define AOFF_task_thread	0x00000580
+#define AOFF_task_thread	0x00000570
 #define ASIZ_task_thread	0x00000450
-#define AOFF_task_fs	0x000009d0
+#define AOFF_task_fs	0x000009c0
 #define ASIZ_task_fs	0x00000008
-#define AOFF_task_files	0x000009d8
+#define AOFF_task_files	0x000009c8
 #define ASIZ_task_files	0x00000008
-#define AOFF_task_sigmask_lock	0x000009e0
+#define AOFF_task_sigmask_lock	0x000009d0
 #define ASIZ_task_sigmask_lock	0x0000000c
-#define AOFF_task_sig	0x000009f0
+#define AOFF_task_sig	0x000009e0
 #define ASIZ_task_sig	0x00000008
-#define AOFF_task_signal	0x000009f8
+#define AOFF_task_signal	0x000009e8
 #define ASIZ_task_signal	0x00000008
-#define AOFF_task_blocked	0x00000a00
+#define AOFF_task_blocked	0x000009f0
 #define ASIZ_task_blocked	0x00000008
-#define AOFF_task_sigqueue	0x00000a08
+#define AOFF_task_sigqueue	0x000009f8
 #define ASIZ_task_sigqueue	0x00000008
-#define AOFF_task_sigqueue_tail	0x00000a10
+#define AOFF_task_sigqueue_tail	0x00000a00
 #define ASIZ_task_sigqueue_tail	0x00000008
-#define AOFF_task_sas_ss_sp	0x00000a18
+#define AOFF_task_sas_ss_sp	0x00000a08
 #define ASIZ_task_sas_ss_sp	0x00000008
-#define AOFF_task_sas_ss_size	0x00000a20
+#define AOFF_task_sas_ss_size	0x00000a10
 #define ASIZ_task_sas_ss_size	0x00000008
-#define AOFF_task_parent_exec_id	0x00000a28
+#define AOFF_task_parent_exec_id	0x00000a18
 #define ASIZ_task_parent_exec_id	0x00000004
-#define AOFF_task_self_exec_id	0x00000a2c
+#define AOFF_task_self_exec_id	0x00000a1c
 #define ASIZ_task_self_exec_id	0x00000004
-#define AOFF_task_alloc_lock	0x00000a30
+#define AOFF_task_alloc_lock	0x00000a20
 #define ASIZ_task_alloc_lock	0x0000000c
-#define ASIZ_task	0x00000a40
+#define ASIZ_task	0x00000a30
 #define AOFF_mm_mmap	0x00000000
 #define ASIZ_mm_mmap	0x00000008
 #define AOFF_mm_mmap_avl	0x00000008
@@ -794,50 +794,50 @@
 #define AOFF_mm_map_count	0x00000028
 #define ASIZ_mm_map_count	0x00000004
 #define AOFF_mm_mmap_sem	0x00000030
-#define ASIZ_mm_mmap_sem	0x00000040
-#define AOFF_mm_page_table_lock	0x00000070
+#define ASIZ_mm_mmap_sem	0x00000028
+#define AOFF_mm_page_table_lock	0x00000058
 #define ASIZ_mm_page_table_lock	0x0000000c
-#define AOFF_mm_context	0x00000080
+#define AOFF_mm_context	0x00000068
 #define ASIZ_mm_context	0x00000008
-#define AOFF_mm_start_code	0x00000088
+#define AOFF_mm_start_code	0x00000070
 #define ASIZ_mm_start_code	0x00000008
-#define AOFF_mm_end_code	0x00000090
+#define AOFF_mm_end_code	0x00000078
 #define ASIZ_mm_end_code	0x00000008
-#define AOFF_mm_start_data	0x00000098
+#define AOFF_mm_start_data	0x00000080
 #define ASIZ_mm_start_data	0x00000008
-#define AOFF_mm_end_data	0x000000a0
+#define AOFF_mm_end_data	0x00000088
 #define ASIZ_mm_end_data	0x00000008
-#define AOFF_mm_start_brk	0x000000a8
+#define AOFF_mm_start_brk	0x00000090
 #define ASIZ_mm_start_brk	0x00000008
-#define AOFF_mm_brk	0x000000b0
+#define AOFF_mm_brk	0x00000098
 #define ASIZ_mm_brk	0x00000008
-#define AOFF_mm_start_stack	0x000000b8
+#define AOFF_mm_start_stack	0x000000a0
 #define ASIZ_mm_start_stack	0x00000008
-#define AOFF_mm_arg_start	0x000000c0
+#define AOFF_mm_arg_start	0x000000a8
 #define ASIZ_mm_arg_start	0x00000008
-#define AOFF_mm_arg_end	0x000000c8
+#define AOFF_mm_arg_end	0x000000b0
 #define ASIZ_mm_arg_end	0x00000008
-#define AOFF_mm_env_start	0x000000d0
+#define AOFF_mm_env_start	0x000000b8
 #define ASIZ_mm_env_start	0x00000008
-#define AOFF_mm_env_end	0x000000d8
+#define AOFF_mm_env_end	0x000000c0
 #define ASIZ_mm_env_end	0x00000008
-#define AOFF_mm_rss	0x000000e0
+#define AOFF_mm_rss	0x000000c8
 #define ASIZ_mm_rss	0x00000008
-#define AOFF_mm_total_vm	0x000000e8
+#define AOFF_mm_total_vm	0x000000d0
 #define ASIZ_mm_total_vm	0x00000008
-#define AOFF_mm_locked_vm	0x000000f0
+#define AOFF_mm_locked_vm	0x000000d8
 #define ASIZ_mm_locked_vm	0x00000008
-#define AOFF_mm_def_flags	0x000000f8
+#define AOFF_mm_def_flags	0x000000e0
 #define ASIZ_mm_def_flags	0x00000008
-#define AOFF_mm_cpu_vm_mask	0x00000100
+#define AOFF_mm_cpu_vm_mask	0x000000e8
 #define ASIZ_mm_cpu_vm_mask	0x00000008
-#define AOFF_mm_swap_cnt	0x00000108
+#define AOFF_mm_swap_cnt	0x000000f0
 #define ASIZ_mm_swap_cnt	0x00000008
-#define AOFF_mm_swap_address	0x00000110
+#define AOFF_mm_swap_address	0x000000f8
 #define ASIZ_mm_swap_address	0x00000008
-#define AOFF_mm_segments	0x00000118
+#define AOFF_mm_segments	0x00000100
 #define ASIZ_mm_segments	0x00000008
-#define ASIZ_mm	0x00000120
+#define ASIZ_mm	0x00000108
 #define AOFF_thread_ksp	0x00000000
 #define ASIZ_thread_ksp	0x00000008
 #define AOFF_thread_wstate	0x00000008
diff --git a/include/asm-sparc64/elf.h b/include/asm-sparc64/elf.h
index 8a5404930..7e3adf02f 100644
--- a/include/asm-sparc64/elf.h
+++ b/include/asm-sparc64/elf.h
@@ -1,4 +1,4 @@
-/* $Id: elf.h,v 1.24 2000/04/14 09:59:04 davem Exp $ */
+/* $Id: elf.h,v 1.25 2000/07/12 01:27:08 davem Exp $ */
 #ifndef __ASM_SPARC64_ELF_H
 #define __ASM_SPARC64_ELF_H
 
diff --git a/include/asm-sparc64/semaphore.h b/include/asm-sparc64/semaphore.h
index 85ae21c9d..5a53d342d 100644
--- a/include/asm-sparc64/semaphore.h
+++ b/include/asm-sparc64/semaphore.h
@@ -7,6 +7,7 @@
 #include <asm/atomic.h>
 #include <asm/bitops.h>
 #include <asm/system.h>
+#include <linux/wait.h>
 
 struct semaphore {
 	atomic_t count;