Merge with Linux 2.3.99-pre7 and various other bits.

1 files changed, 36 insertions, 48 deletions

diff --git a/include/asm-sparc64/asm_offsets.h b/include/asm-sparc64/asm_offsets.h
index f04220ee6..4507a6716 100644
--- a/include/asm-sparc64/asm_offsets.h
+++ b/include/asm-sparc64/asm_offsets.h
@@ -190,9 +190,9 @@
 #define ASIZ_task_parent_exec_id	0x00000004
 #define AOFF_task_self_exec_id	0x00000834
 #define ASIZ_task_self_exec_id	0x00000004
-#define AOFF_task_exit_sem	0x00000838
-#define ASIZ_task_exit_sem	0x00000038
-#define ASIZ_task	0x00000870
+#define AOFF_task_alloc_lock	0x00000838
+#define ASIZ_task_alloc_lock	0x00000004
+#define ASIZ_task	0x00000840
 #define AOFF_mm_mmap	0x00000000
 #define ASIZ_mm_mmap	0x00000008
 #define AOFF_mm_mmap_avl	0x00000008
@@ -235,27 +235,23 @@
 #define ASIZ_mm_env_start	0x00000008
 #define AOFF_mm_env_end	0x000000c8
 #define ASIZ_mm_env_end	0x00000008
-#define AOFF_mm_min_flt	0x000000d0
-#define ASIZ_mm_min_flt	0x00000008
-#define AOFF_mm_maj_flt	0x000000d8
-#define ASIZ_mm_maj_flt	0x00000008
-#define AOFF_mm_rss	0x000000e0
+#define AOFF_mm_rss	0x000000d0
 #define ASIZ_mm_rss	0x00000008
-#define AOFF_mm_total_vm	0x000000e8
+#define AOFF_mm_total_vm	0x000000d8
 #define ASIZ_mm_total_vm	0x00000008
-#define AOFF_mm_locked_vm	0x000000f0
+#define AOFF_mm_locked_vm	0x000000e0
 #define ASIZ_mm_locked_vm	0x00000008
-#define AOFF_mm_def_flags	0x000000f8
+#define AOFF_mm_def_flags	0x000000e8
 #define ASIZ_mm_def_flags	0x00000008
-#define AOFF_mm_cpu_vm_mask	0x00000100
+#define AOFF_mm_cpu_vm_mask	0x000000f0
 #define ASIZ_mm_cpu_vm_mask	0x00000008
-#define AOFF_mm_swap_cnt	0x00000108
+#define AOFF_mm_swap_cnt	0x000000f8
 #define ASIZ_mm_swap_cnt	0x00000008
-#define AOFF_mm_swap_address	0x00000110
+#define AOFF_mm_swap_address	0x00000100
 #define ASIZ_mm_swap_address	0x00000008
-#define AOFF_mm_segments	0x00000118
+#define AOFF_mm_segments	0x00000108
 #define ASIZ_mm_segments	0x00000008
-#define ASIZ_mm	0x00000120
+#define ASIZ_mm	0x00000110
 #define AOFF_thread_ksp	0x00000000
 #define ASIZ_thread_ksp	0x00000008
 #define AOFF_thread_wstate	0x00000008
@@ -488,9 +484,9 @@
 #define ASIZ_task_parent_exec_id	0x00000004
 #define AOFF_task_self_exec_id	0x00000a24
 #define ASIZ_task_self_exec_id	0x00000004
-#define AOFF_task_exit_sem	0x00000a28
-#define ASIZ_task_exit_sem	0x00000038
-#define ASIZ_task	0x00000a60
+#define AOFF_task_alloc_lock	0x00000a28
+#define ASIZ_task_alloc_lock	0x00000001
+#define ASIZ_task	0x00000a30
 #define AOFF_mm_mmap	0x00000000
 #define ASIZ_mm_mmap	0x00000008
 #define AOFF_mm_mmap_avl	0x00000008
@@ -533,27 +529,23 @@
 #define ASIZ_mm_env_start	0x00000008
 #define AOFF_mm_env_end	0x000000c8
 #define ASIZ_mm_env_end	0x00000008
-#define AOFF_mm_min_flt	0x000000d0
-#define ASIZ_mm_min_flt	0x00000008
-#define AOFF_mm_maj_flt	0x000000d8
-#define ASIZ_mm_maj_flt	0x00000008
-#define AOFF_mm_rss	0x000000e0
+#define AOFF_mm_rss	0x000000d0
 #define ASIZ_mm_rss	0x00000008
-#define AOFF_mm_total_vm	0x000000e8
+#define AOFF_mm_total_vm	0x000000d8
 #define ASIZ_mm_total_vm	0x00000008
-#define AOFF_mm_locked_vm	0x000000f0
+#define AOFF_mm_locked_vm	0x000000e0
 #define ASIZ_mm_locked_vm	0x00000008
-#define AOFF_mm_def_flags	0x000000f8
+#define AOFF_mm_def_flags	0x000000e8
 #define ASIZ_mm_def_flags	0x00000008
-#define AOFF_mm_cpu_vm_mask	0x00000100
+#define AOFF_mm_cpu_vm_mask	0x000000f0
 #define ASIZ_mm_cpu_vm_mask	0x00000008
-#define AOFF_mm_swap_cnt	0x00000108
+#define AOFF_mm_swap_cnt	0x000000f8
 #define ASIZ_mm_swap_cnt	0x00000008
-#define AOFF_mm_swap_address	0x00000110
+#define AOFF_mm_swap_address	0x00000100
 #define ASIZ_mm_swap_address	0x00000008
-#define AOFF_mm_segments	0x00000118
+#define AOFF_mm_segments	0x00000108
 #define ASIZ_mm_segments	0x00000008
-#define ASIZ_mm	0x00000120
+#define ASIZ_mm	0x00000110
 #define AOFF_thread_ksp	0x00000000
 #define ASIZ_thread_ksp	0x00000008
 #define AOFF_thread_wstate	0x00000008
@@ -784,9 +776,9 @@
 #define ASIZ_task_parent_exec_id	0x00000004
 #define AOFF_task_self_exec_id	0x00000a3c
 #define ASIZ_task_self_exec_id	0x00000004
-#define AOFF_task_exit_sem	0x00000a40
-#define ASIZ_task_exit_sem	0x00000040
-#define ASIZ_task	0x00000a80
+#define AOFF_task_alloc_lock	0x00000a40
+#define ASIZ_task_alloc_lock	0x0000000c
+#define ASIZ_task	0x00000a50
 #define AOFF_mm_mmap	0x00000000
 #define ASIZ_mm_mmap	0x00000008
 #define AOFF_mm_mmap_avl	0x00000008
@@ -829,27 +821,23 @@
 #define ASIZ_mm_env_start	0x00000008
 #define AOFF_mm_env_end	0x000000d8
 #define ASIZ_mm_env_end	0x00000008
-#define AOFF_mm_min_flt	0x000000e0
-#define ASIZ_mm_min_flt	0x00000008
-#define AOFF_mm_maj_flt	0x000000e8
-#define ASIZ_mm_maj_flt	0x00000008
-#define AOFF_mm_rss	0x000000f0
+#define AOFF_mm_rss	0x000000e0
 #define ASIZ_mm_rss	0x00000008
-#define AOFF_mm_total_vm	0x000000f8
+#define AOFF_mm_total_vm	0x000000e8
 #define ASIZ_mm_total_vm	0x00000008
-#define AOFF_mm_locked_vm	0x00000100
+#define AOFF_mm_locked_vm	0x000000f0
 #define ASIZ_mm_locked_vm	0x00000008
-#define AOFF_mm_def_flags	0x00000108
+#define AOFF_mm_def_flags	0x000000f8
 #define ASIZ_mm_def_flags	0x00000008
-#define AOFF_mm_cpu_vm_mask	0x00000110
+#define AOFF_mm_cpu_vm_mask	0x00000100
 #define ASIZ_mm_cpu_vm_mask	0x00000008
-#define AOFF_mm_swap_cnt	0x00000118
+#define AOFF_mm_swap_cnt	0x00000108
 #define ASIZ_mm_swap_cnt	0x00000008
-#define AOFF_mm_swap_address	0x00000120
+#define AOFF_mm_swap_address	0x00000110
 #define ASIZ_mm_swap_address	0x00000008
-#define AOFF_mm_segments	0x00000128
+#define AOFF_mm_segments	0x00000118
 #define ASIZ_mm_segments	0x00000008
-#define ASIZ_mm	0x00000130
+#define ASIZ_mm	0x00000120
 #define AOFF_thread_ksp	0x00000000
 #define ASIZ_thread_ksp	0x00000008
 #define AOFF_thread_wstate	0x00000008