Merge with Linux 2.1.131 and more MIPS goodies.

(Did I mention that CVS is buggy ...)

1 files changed, 90 insertions, 90 deletions

diff --git a/include/asm-sparc/asm_offsets.h b/include/asm-sparc/asm_offsets.h
index d2f9a582b..655987dd5 100644
--- a/include/asm-sparc/asm_offsets.h
+++ b/include/asm-sparc/asm_offsets.h
@@ -74,78 +74,78 @@
 #define ASIZ_task_tarray_ptr	0x00000004
 #define AOFF_task_wait_chldexit	0x0000008c
 #define ASIZ_task_wait_chldexit	0x00000004
-#define AOFF_task_timeout	0x00000090
-#define ASIZ_task_timeout	0x00000004
-#define AOFF_task_policy	0x00000094
+#define AOFF_task_policy	0x00000090
 #define ASIZ_task_policy	0x00000004
-#define AOFF_task_rt_priority	0x00000098
+#define AOFF_task_rt_priority	0x00000094
 #define ASIZ_task_rt_priority	0x00000004
-#define AOFF_task_it_real_value	0x0000009c
+#define AOFF_task_it_real_value	0x00000098
 #define ASIZ_task_it_real_value	0x00000004
-#define AOFF_task_it_prof_value	0x000000a0
+#define AOFF_task_it_prof_value	0x0000009c
 #define ASIZ_task_it_prof_value	0x00000004
-#define AOFF_task_it_virt_value	0x000000a4
+#define AOFF_task_it_virt_value	0x000000a0
 #define ASIZ_task_it_virt_value	0x00000004
-#define AOFF_task_it_real_incr	0x000000a8
+#define AOFF_task_it_real_incr	0x000000a4
 #define ASIZ_task_it_real_incr	0x00000004
-#define AOFF_task_it_prof_incr	0x000000ac
+#define AOFF_task_it_prof_incr	0x000000a8
 #define ASIZ_task_it_prof_incr	0x00000004
-#define AOFF_task_it_virt_incr	0x000000b0
+#define AOFF_task_it_virt_incr	0x000000ac
 #define ASIZ_task_it_virt_incr	0x00000004
-#define AOFF_task_real_timer	0x000000b4
+#define AOFF_task_real_timer	0x000000b0
 #define ASIZ_task_real_timer	0x00000014
-#define AOFF_task_times	0x000000c8
+#define AOFF_task_times	0x000000c4
 #define ASIZ_task_times	0x00000010
-#define AOFF_task_start_time	0x000000d8
+#define AOFF_task_start_time	0x000000d4
 #define ASIZ_task_start_time	0x00000004
-#define AOFF_task_per_cpu_utime	0x000000dc
+#define AOFF_task_per_cpu_utime	0x000000d8
 #define ASIZ_task_per_cpu_utime	0x00000004
-#define AOFF_task_min_flt	0x000000e4
+#define AOFF_task_min_flt	0x000000e0
 #define ASIZ_task_min_flt	0x00000004
-#define AOFF_task_maj_flt	0x000000e8
+#define AOFF_task_maj_flt	0x000000e4
 #define ASIZ_task_maj_flt	0x00000004
-#define AOFF_task_nswap	0x000000ec
+#define AOFF_task_nswap	0x000000e8
 #define ASIZ_task_nswap	0x00000004
-#define AOFF_task_cmin_flt	0x000000f0
+#define AOFF_task_cmin_flt	0x000000ec
 #define ASIZ_task_cmin_flt	0x00000004
-#define AOFF_task_cmaj_flt	0x000000f4
+#define AOFF_task_cmaj_flt	0x000000f0
 #define ASIZ_task_cmaj_flt	0x00000004
-#define AOFF_task_cnswap	0x000000f8
+#define AOFF_task_cnswap	0x000000f4
 #define ASIZ_task_cnswap	0x00000004
-#define AOFF_task_swap_address	0x00000100
+#define AOFF_task_swap_address	0x000000fc
 #define ASIZ_task_swap_address	0x00000004
-#define AOFF_task_old_maj_flt	0x00000104
+#define AOFF_task_old_maj_flt	0x00000100
 #define ASIZ_task_old_maj_flt	0x00000004
-#define AOFF_task_dec_flt	0x00000108
+#define AOFF_task_dec_flt	0x00000104
 #define ASIZ_task_dec_flt	0x00000004
-#define AOFF_task_swap_cnt	0x0000010c
+#define AOFF_task_swap_cnt	0x00000108
 #define ASIZ_task_swap_cnt	0x00000004
-#define AOFF_task_uid	0x00000110
+#define AOFF_task_uid	0x0000010c
 #define ASIZ_task_uid	0x00000002
-#define AOFF_task_euid	0x00000112
+#define AOFF_task_euid	0x0000010e
 #define ASIZ_task_euid	0x00000002
-#define AOFF_task_suid	0x00000114
+#define AOFF_task_suid	0x00000110
 #define ASIZ_task_suid	0x00000002
-#define AOFF_task_fsuid	0x00000116
+#define AOFF_task_fsuid	0x00000112
 #define ASIZ_task_fsuid	0x00000002
-#define AOFF_task_gid	0x00000118
+#define AOFF_task_gid	0x00000114
 #define ASIZ_task_gid	0x00000002
-#define AOFF_task_egid	0x0000011a
+#define AOFF_task_egid	0x00000116
 #define ASIZ_task_egid	0x00000002
-#define AOFF_task_sgid	0x0000011c
+#define AOFF_task_sgid	0x00000118
 #define ASIZ_task_sgid	0x00000002
-#define AOFF_task_fsgid	0x0000011e
+#define AOFF_task_fsgid	0x0000011a
 #define ASIZ_task_fsgid	0x00000002
-#define AOFF_task_ngroups	0x00000120
+#define AOFF_task_ngroups	0x0000011c
 #define ASIZ_task_ngroups	0x00000004
-#define AOFF_task_groups	0x00000124
+#define AOFF_task_groups	0x00000120
 #define ASIZ_task_groups	0x00000040
-#define AOFF_task_cap_effective	0x00000164
+#define AOFF_task_cap_effective	0x00000160
 #define ASIZ_task_cap_effective	0x00000004
-#define AOFF_task_cap_inheritable	0x00000168
+#define AOFF_task_cap_inheritable	0x00000164
 #define ASIZ_task_cap_inheritable	0x00000004
-#define AOFF_task_cap_permitted	0x0000016c
+#define AOFF_task_cap_permitted	0x00000168
 #define ASIZ_task_cap_permitted	0x00000004
+#define AOFF_task_user	0x0000016c
+#define ASIZ_task_user	0x00000004
 #define AOFF_task_rlim	0x00000170
 #define ASIZ_task_rlim	0x00000050
 #define AOFF_task_used_math	0x000001c0
@@ -169,20 +169,20 @@
 #define AOFF_task_mm	0x00000578
 #define ASIZ_task_mm	0x00000004
 #define AOFF_task_sigmask_lock	0x0000057c
-#define ASIZ_task_sigmask_lock	0x00000000
-#define AOFF_task_sig	0x0000057c
+#define ASIZ_task_sigmask_lock	0x00000001
+#define AOFF_task_sig	0x00000580
 #define ASIZ_task_sig	0x00000004
-#define AOFF_task_signal	0x00000580
+#define AOFF_task_signal	0x00000584
 #define ASIZ_task_signal	0x00000008
-#define AOFF_task_blocked	0x00000588
+#define AOFF_task_blocked	0x0000058c
 #define ASIZ_task_blocked	0x00000008
-#define AOFF_task_sigqueue	0x00000590
+#define AOFF_task_sigqueue	0x00000594
 #define ASIZ_task_sigqueue	0x00000004
-#define AOFF_task_sigqueue_tail	0x00000594
+#define AOFF_task_sigqueue_tail	0x00000598
 #define ASIZ_task_sigqueue_tail	0x00000004
-#define AOFF_task_sas_ss_sp	0x00000598
+#define AOFF_task_sas_ss_sp	0x0000059c
 #define ASIZ_task_sas_ss_sp	0x00000004
-#define AOFF_task_sas_ss_size	0x0000059c
+#define AOFF_task_sas_ss_size	0x000005a0
 #define ASIZ_task_sas_ss_size	0x00000004
 #define AOFF_mm_mmap	0x00000000
 #define ASIZ_mm_mmap	0x00000004
@@ -347,78 +347,78 @@
 #define ASIZ_task_tarray_ptr	0x00000004
 #define AOFF_task_wait_chldexit	0x0000008c
 #define ASIZ_task_wait_chldexit	0x00000004
-#define AOFF_task_timeout	0x00000090
-#define ASIZ_task_timeout	0x00000004
-#define AOFF_task_policy	0x00000094
+#define AOFF_task_policy	0x00000090
 #define ASIZ_task_policy	0x00000004
-#define AOFF_task_rt_priority	0x00000098
+#define AOFF_task_rt_priority	0x00000094
 #define ASIZ_task_rt_priority	0x00000004
-#define AOFF_task_it_real_value	0x0000009c
+#define AOFF_task_it_real_value	0x00000098
 #define ASIZ_task_it_real_value	0x00000004
-#define AOFF_task_it_prof_value	0x000000a0
+#define AOFF_task_it_prof_value	0x0000009c
 #define ASIZ_task_it_prof_value	0x00000004
-#define AOFF_task_it_virt_value	0x000000a4
+#define AOFF_task_it_virt_value	0x000000a0
 #define ASIZ_task_it_virt_value	0x00000004
-#define AOFF_task_it_real_incr	0x000000a8
+#define AOFF_task_it_real_incr	0x000000a4
 #define ASIZ_task_it_real_incr	0x00000004
-#define AOFF_task_it_prof_incr	0x000000ac
+#define AOFF_task_it_prof_incr	0x000000a8
 #define ASIZ_task_it_prof_incr	0x00000004
-#define AOFF_task_it_virt_incr	0x000000b0
+#define AOFF_task_it_virt_incr	0x000000ac
 #define ASIZ_task_it_virt_incr	0x00000004
-#define AOFF_task_real_timer	0x000000b4
+#define AOFF_task_real_timer	0x000000b0
 #define ASIZ_task_real_timer	0x00000014
-#define AOFF_task_times	0x000000c8
+#define AOFF_task_times	0x000000c4
 #define ASIZ_task_times	0x00000010
-#define AOFF_task_start_time	0x000000d8
+#define AOFF_task_start_time	0x000000d4
 #define ASIZ_task_start_time	0x00000004
-#define AOFF_task_per_cpu_utime	0x000000dc
+#define AOFF_task_per_cpu_utime	0x000000d8
 #define ASIZ_task_per_cpu_utime	0x00000080
-#define AOFF_task_min_flt	0x000001dc
+#define AOFF_task_min_flt	0x000001d8
 #define ASIZ_task_min_flt	0x00000004
-#define AOFF_task_maj_flt	0x000001e0
+#define AOFF_task_maj_flt	0x000001dc
 #define ASIZ_task_maj_flt	0x00000004
-#define AOFF_task_nswap	0x000001e4
+#define AOFF_task_nswap	0x000001e0
 #define ASIZ_task_nswap	0x00000004
-#define AOFF_task_cmin_flt	0x000001e8
+#define AOFF_task_cmin_flt	0x000001e4
 #define ASIZ_task_cmin_flt	0x00000004
-#define AOFF_task_cmaj_flt	0x000001ec
+#define AOFF_task_cmaj_flt	0x000001e8
 #define ASIZ_task_cmaj_flt	0x00000004
-#define AOFF_task_cnswap	0x000001f0
+#define AOFF_task_cnswap	0x000001ec
 #define ASIZ_task_cnswap	0x00000004
-#define AOFF_task_swap_address	0x000001f8
+#define AOFF_task_swap_address	0x000001f4
 #define ASIZ_task_swap_address	0x00000004
-#define AOFF_task_old_maj_flt	0x000001fc
+#define AOFF_task_old_maj_flt	0x000001f8
 #define ASIZ_task_old_maj_flt	0x00000004
-#define AOFF_task_dec_flt	0x00000200
+#define AOFF_task_dec_flt	0x000001fc
 #define ASIZ_task_dec_flt	0x00000004
-#define AOFF_task_swap_cnt	0x00000204
+#define AOFF_task_swap_cnt	0x00000200
 #define ASIZ_task_swap_cnt	0x00000004
-#define AOFF_task_uid	0x00000208
+#define AOFF_task_uid	0x00000204
 #define ASIZ_task_uid	0x00000002
-#define AOFF_task_euid	0x0000020a
+#define AOFF_task_euid	0x00000206
 #define ASIZ_task_euid	0x00000002
-#define AOFF_task_suid	0x0000020c
+#define AOFF_task_suid	0x00000208
 #define ASIZ_task_suid	0x00000002
-#define AOFF_task_fsuid	0x0000020e
+#define AOFF_task_fsuid	0x0000020a
 #define ASIZ_task_fsuid	0x00000002
-#define AOFF_task_gid	0x00000210
+#define AOFF_task_gid	0x0000020c
 #define ASIZ_task_gid	0x00000002
-#define AOFF_task_egid	0x00000212
+#define AOFF_task_egid	0x0000020e
 #define ASIZ_task_egid	0x00000002
-#define AOFF_task_sgid	0x00000214
+#define AOFF_task_sgid	0x00000210
 #define ASIZ_task_sgid	0x00000002
-#define AOFF_task_fsgid	0x00000216
+#define AOFF_task_fsgid	0x00000212
 #define ASIZ_task_fsgid	0x00000002
-#define AOFF_task_ngroups	0x00000218
+#define AOFF_task_ngroups	0x00000214
 #define ASIZ_task_ngroups	0x00000004
-#define AOFF_task_groups	0x0000021c
+#define AOFF_task_groups	0x00000218
 #define ASIZ_task_groups	0x00000040
-#define AOFF_task_cap_effective	0x0000025c
+#define AOFF_task_cap_effective	0x00000258
 #define ASIZ_task_cap_effective	0x00000004
-#define AOFF_task_cap_inheritable	0x00000260
+#define AOFF_task_cap_inheritable	0x0000025c
 #define ASIZ_task_cap_inheritable	0x00000004
-#define AOFF_task_cap_permitted	0x00000264
+#define AOFF_task_cap_permitted	0x00000260
 #define ASIZ_task_cap_permitted	0x00000004
+#define AOFF_task_user	0x00000264
+#define ASIZ_task_user	0x00000004
 #define AOFF_task_rlim	0x00000268
 #define ASIZ_task_rlim	0x00000050
 #define AOFF_task_used_math	0x000002b8
@@ -442,20 +442,20 @@
 #define AOFF_task_mm	0x00000670
 #define ASIZ_task_mm	0x00000004
 #define AOFF_task_sigmask_lock	0x00000674
-#define ASIZ_task_sigmask_lock	0x00000001
-#define AOFF_task_sig	0x00000678
+#define ASIZ_task_sigmask_lock	0x00000008
+#define AOFF_task_sig	0x0000067c
 #define ASIZ_task_sig	0x00000004
-#define AOFF_task_signal	0x0000067c
+#define AOFF_task_signal	0x00000680
 #define ASIZ_task_signal	0x00000008
-#define AOFF_task_blocked	0x00000684
+#define AOFF_task_blocked	0x00000688
 #define ASIZ_task_blocked	0x00000008
-#define AOFF_task_sigqueue	0x0000068c
+#define AOFF_task_sigqueue	0x00000690
 #define ASIZ_task_sigqueue	0x00000004
-#define AOFF_task_sigqueue_tail	0x00000690
+#define AOFF_task_sigqueue_tail	0x00000694
 #define ASIZ_task_sigqueue_tail	0x00000004
-#define AOFF_task_sas_ss_sp	0x00000694
+#define AOFF_task_sas_ss_sp	0x00000698
 #define ASIZ_task_sas_ss_sp	0x00000004
-#define AOFF_task_sas_ss_size	0x00000698
+#define AOFF_task_sas_ss_size	0x0000069c
 #define ASIZ_task_sas_ss_size	0x00000004
 #define AOFF_mm_mmap	0x00000000
 #define ASIZ_mm_mmap	0x00000004