Merge with 2.3.10.

3 files changed, 44 insertions, 42 deletions

diff --git a/include/asm-sparc/asm_offsets.h b/include/asm-sparc/asm_offsets.h
index f8ffd64a2..dc35d5481 100644
--- a/include/asm-sparc/asm_offsets.h
+++ b/include/asm-sparc/asm_offsets.h
@@ -196,45 +196,47 @@
 #define ASIZ_mm_map_count	0x00000004
 #define AOFF_mm_mmap_sem	0x00000018
 #define ASIZ_mm_mmap_sem	0x00000020
-#define AOFF_mm_context	0x00000038
+#define AOFF_mm_page_table_lock	0x00000038
+#define ASIZ_mm_page_table_lock	0x00000001
+#define AOFF_mm_context	0x0000003c
 #define ASIZ_mm_context	0x00000004
-#define AOFF_mm_start_code	0x0000003c
+#define AOFF_mm_start_code	0x00000040
 #define ASIZ_mm_start_code	0x00000004
-#define AOFF_mm_end_code	0x00000040
+#define AOFF_mm_end_code	0x00000044
 #define ASIZ_mm_end_code	0x00000004
-#define AOFF_mm_start_data	0x00000044
+#define AOFF_mm_start_data	0x00000048
 #define ASIZ_mm_start_data	0x00000004
-#define AOFF_mm_end_data	0x00000048
+#define AOFF_mm_end_data	0x0000004c
 #define ASIZ_mm_end_data	0x00000004
-#define AOFF_mm_start_brk	0x0000004c
+#define AOFF_mm_start_brk	0x00000050
 #define ASIZ_mm_start_brk	0x00000004
-#define AOFF_mm_brk	0x00000050
+#define AOFF_mm_brk	0x00000054
 #define ASIZ_mm_brk	0x00000004
-#define AOFF_mm_start_stack	0x00000054
+#define AOFF_mm_start_stack	0x00000058
 #define ASIZ_mm_start_stack	0x00000004
-#define AOFF_mm_arg_start	0x00000058
+#define AOFF_mm_arg_start	0x0000005c
 #define ASIZ_mm_arg_start	0x00000004
-#define AOFF_mm_arg_end	0x0000005c
+#define AOFF_mm_arg_end	0x00000060
 #define ASIZ_mm_arg_end	0x00000004
-#define AOFF_mm_env_start	0x00000060
+#define AOFF_mm_env_start	0x00000064
 #define ASIZ_mm_env_start	0x00000004
-#define AOFF_mm_env_end	0x00000064
+#define AOFF_mm_env_end	0x00000068
 #define ASIZ_mm_env_end	0x00000004
-#define AOFF_mm_rss	0x00000068
+#define AOFF_mm_rss	0x0000006c
 #define ASIZ_mm_rss	0x00000004
-#define AOFF_mm_total_vm	0x0000006c
+#define AOFF_mm_total_vm	0x00000070
 #define ASIZ_mm_total_vm	0x00000004
-#define AOFF_mm_locked_vm	0x00000070
+#define AOFF_mm_locked_vm	0x00000074
 #define ASIZ_mm_locked_vm	0x00000004
-#define AOFF_mm_def_flags	0x00000074
+#define AOFF_mm_def_flags	0x00000078
 #define ASIZ_mm_def_flags	0x00000004
-#define AOFF_mm_cpu_vm_mask	0x00000078
+#define AOFF_mm_cpu_vm_mask	0x0000007c
 #define ASIZ_mm_cpu_vm_mask	0x00000004
-#define AOFF_mm_swap_cnt	0x0000007c
+#define AOFF_mm_swap_cnt	0x00000080
 #define ASIZ_mm_swap_cnt	0x00000004
-#define AOFF_mm_swap_address	0x00000080
+#define AOFF_mm_swap_address	0x00000084
 #define ASIZ_mm_swap_address	0x00000004
-#define AOFF_mm_segments	0x00000084
+#define AOFF_mm_segments	0x00000088
 #define ASIZ_mm_segments	0x00000004
 #define AOFF_thread_uwinmask	0x00000000
 #define ASIZ_thread_uwinmask	0x00000004
@@ -471,45 +473,47 @@
 #define ASIZ_mm_map_count	0x00000004
 #define AOFF_mm_mmap_sem	0x00000018
 #define ASIZ_mm_mmap_sem	0x00000024
-#define AOFF_mm_context	0x0000003c
+#define AOFF_mm_page_table_lock	0x0000003c
+#define ASIZ_mm_page_table_lock	0x00000008
+#define AOFF_mm_context	0x00000044
 #define ASIZ_mm_context	0x00000004
-#define AOFF_mm_start_code	0x00000040
+#define AOFF_mm_start_code	0x00000048
 #define ASIZ_mm_start_code	0x00000004
-#define AOFF_mm_end_code	0x00000044
+#define AOFF_mm_end_code	0x0000004c
 #define ASIZ_mm_end_code	0x00000004
-#define AOFF_mm_start_data	0x00000048
+#define AOFF_mm_start_data	0x00000050
 #define ASIZ_mm_start_data	0x00000004
-#define AOFF_mm_end_data	0x0000004c
+#define AOFF_mm_end_data	0x00000054
 #define ASIZ_mm_end_data	0x00000004
-#define AOFF_mm_start_brk	0x00000050
+#define AOFF_mm_start_brk	0x00000058
 #define ASIZ_mm_start_brk	0x00000004
-#define AOFF_mm_brk	0x00000054
+#define AOFF_mm_brk	0x0000005c
 #define ASIZ_mm_brk	0x00000004
-#define AOFF_mm_start_stack	0x00000058
+#define AOFF_mm_start_stack	0x00000060
 #define ASIZ_mm_start_stack	0x00000004
-#define AOFF_mm_arg_start	0x0000005c
+#define AOFF_mm_arg_start	0x00000064
 #define ASIZ_mm_arg_start	0x00000004
-#define AOFF_mm_arg_end	0x00000060
+#define AOFF_mm_arg_end	0x00000068
 #define ASIZ_mm_arg_end	0x00000004
-#define AOFF_mm_env_start	0x00000064
+#define AOFF_mm_env_start	0x0000006c
 #define ASIZ_mm_env_start	0x00000004
-#define AOFF_mm_env_end	0x00000068
+#define AOFF_mm_env_end	0x00000070
 #define ASIZ_mm_env_end	0x00000004
-#define AOFF_mm_rss	0x0000006c
+#define AOFF_mm_rss	0x00000074
 #define ASIZ_mm_rss	0x00000004
-#define AOFF_mm_total_vm	0x00000070
+#define AOFF_mm_total_vm	0x00000078
 #define ASIZ_mm_total_vm	0x00000004
-#define AOFF_mm_locked_vm	0x00000074
+#define AOFF_mm_locked_vm	0x0000007c
 #define ASIZ_mm_locked_vm	0x00000004
-#define AOFF_mm_def_flags	0x00000078
+#define AOFF_mm_def_flags	0x00000080
 #define ASIZ_mm_def_flags	0x00000004
-#define AOFF_mm_cpu_vm_mask	0x0000007c
+#define AOFF_mm_cpu_vm_mask	0x00000084
 #define ASIZ_mm_cpu_vm_mask	0x00000004
-#define AOFF_mm_swap_cnt	0x00000080
+#define AOFF_mm_swap_cnt	0x00000088
 #define ASIZ_mm_swap_cnt	0x00000004
-#define AOFF_mm_swap_address	0x00000084
+#define AOFF_mm_swap_address	0x0000008c
 #define ASIZ_mm_swap_address	0x00000004
-#define AOFF_mm_segments	0x00000088
+#define AOFF_mm_segments	0x00000090
 #define ASIZ_mm_segments	0x00000004
 #define AOFF_thread_uwinmask	0x00000000
 #define ASIZ_thread_uwinmask	0x00000004
diff --git a/include/asm-sparc/audioio.h b/include/asm-sparc/audioio.h
index 27543806b..01bebaf73 100644
--- a/include/asm-sparc/audioio.h
+++ b/include/asm-sparc/audioio.h
@@ -237,7 +237,6 @@ typedef struct audio_device {
 
 #ifdef __KERNEL__
 
-#include <linux/types.h>
 #include <linux/fs.h>
 #include <linux/tqueue.h>
 #include <linux/wait.h>
diff --git a/include/asm-sparc/page.h b/include/asm-sparc/page.h
index b014e1739..7ea969e04 100644
--- a/include/asm-sparc/page.h
+++ b/include/asm-sparc/page.h
@@ -19,7 +19,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 #include <asm/head.h>       /* for KERNBASE */
 #include <asm/btfixup.h>