Merge with Linux 2.3.99-pre3.

3 files changed, 39 insertions, 34 deletions

diff --git a/include/asm-sparc/asm_offsets.h b/include/asm-sparc/asm_offsets.h
index 3bbf39b20..57c2ffd9b 100644
--- a/include/asm-sparc/asm_offsets.h
+++ b/include/asm-sparc/asm_offsets.h
@@ -142,21 +142,21 @@
 #define ASIZ_task_cap_inheritable	0x00000004
 #define AOFF_task_cap_permitted	0x000001c8
 #define ASIZ_task_cap_permitted	0x00000004
-#define AOFF_task_user	0x000001cc
+#define AOFF_task_user	0x000001d0
 #define ASIZ_task_user	0x00000004
-#define AOFF_task_rlim	0x000001d0
+#define AOFF_task_rlim	0x000001d4
 #define ASIZ_task_rlim	0x00000050
-#define AOFF_task_used_math	0x00000220
+#define AOFF_task_used_math	0x00000224
 #define ASIZ_task_used_math	0x00000002
-#define AOFF_task_comm	0x00000222
+#define AOFF_task_comm	0x00000226
 #define ASIZ_task_comm	0x00000010
-#define AOFF_task_link_count	0x00000234
+#define AOFF_task_link_count	0x00000238
 #define ASIZ_task_link_count	0x00000004
-#define AOFF_task_tty	0x00000238
+#define AOFF_task_tty	0x0000023c
 #define ASIZ_task_tty	0x00000004
-#define AOFF_task_semundo	0x0000023c
+#define AOFF_task_semundo	0x00000240
 #define ASIZ_task_semundo	0x00000004
-#define AOFF_task_semsleeping	0x00000240
+#define AOFF_task_semsleeping	0x00000244
 #define ASIZ_task_semsleeping	0x00000004
 #define AOFF_task_thread	0x00000248
 #define ASIZ_task_thread	0x00000380
@@ -423,49 +423,49 @@
 #define ASIZ_task_cap_inheritable	0x00000004
 #define AOFF_task_cap_permitted	0x000002c4
 #define ASIZ_task_cap_permitted	0x00000004
-#define AOFF_task_user	0x000002c8
+#define AOFF_task_user	0x000002cc
 #define ASIZ_task_user	0x00000004
-#define AOFF_task_rlim	0x000002cc
+#define AOFF_task_rlim	0x000002d0
 #define ASIZ_task_rlim	0x00000050
-#define AOFF_task_used_math	0x0000031c
+#define AOFF_task_used_math	0x00000320
 #define ASIZ_task_used_math	0x00000002
-#define AOFF_task_comm	0x0000031e
+#define AOFF_task_comm	0x00000322
 #define ASIZ_task_comm	0x00000010
-#define AOFF_task_link_count	0x00000330
+#define AOFF_task_link_count	0x00000334
 #define ASIZ_task_link_count	0x00000004
-#define AOFF_task_tty	0x00000334
+#define AOFF_task_tty	0x00000338
 #define ASIZ_task_tty	0x00000004
-#define AOFF_task_semundo	0x00000338
+#define AOFF_task_semundo	0x0000033c
 #define ASIZ_task_semundo	0x00000004
-#define AOFF_task_semsleeping	0x0000033c
+#define AOFF_task_semsleeping	0x00000340
 #define ASIZ_task_semsleeping	0x00000004
-#define AOFF_task_thread	0x00000340
+#define AOFF_task_thread	0x00000348
 #define ASIZ_task_thread	0x00000380
-#define AOFF_task_fs	0x000006c0
+#define AOFF_task_fs	0x000006c8
 #define ASIZ_task_fs	0x00000004
-#define AOFF_task_files	0x000006c4
+#define AOFF_task_files	0x000006cc
 #define ASIZ_task_files	0x00000004
-#define AOFF_task_sigmask_lock	0x000006c8
+#define AOFF_task_sigmask_lock	0x000006d0
 #define ASIZ_task_sigmask_lock	0x00000008
-#define AOFF_task_sig	0x000006d0
+#define AOFF_task_sig	0x000006d8
 #define ASIZ_task_sig	0x00000004
-#define AOFF_task_signal	0x000006d4
+#define AOFF_task_signal	0x000006dc
 #define ASIZ_task_signal	0x00000008
-#define AOFF_task_blocked	0x000006dc
+#define AOFF_task_blocked	0x000006e4
 #define ASIZ_task_blocked	0x00000008
-#define AOFF_task_sigqueue	0x000006e4
+#define AOFF_task_sigqueue	0x000006ec
 #define ASIZ_task_sigqueue	0x00000004
-#define AOFF_task_sigqueue_tail	0x000006e8
+#define AOFF_task_sigqueue_tail	0x000006f0
 #define ASIZ_task_sigqueue_tail	0x00000004
-#define AOFF_task_sas_ss_sp	0x000006ec
+#define AOFF_task_sas_ss_sp	0x000006f4
 #define ASIZ_task_sas_ss_sp	0x00000004
-#define AOFF_task_sas_ss_size	0x000006f0
+#define AOFF_task_sas_ss_size	0x000006f8
 #define ASIZ_task_sas_ss_size	0x00000004
-#define AOFF_task_parent_exec_id	0x000006f4
+#define AOFF_task_parent_exec_id	0x000006fc
 #define ASIZ_task_parent_exec_id	0x00000004
-#define AOFF_task_self_exec_id	0x000006f8
+#define AOFF_task_self_exec_id	0x00000700
 #define ASIZ_task_self_exec_id	0x00000004
-#define AOFF_task_exit_sem	0x000006fc
+#define AOFF_task_exit_sem	0x00000704
 #define ASIZ_task_exit_sem	0x00000024
 #define AOFF_mm_mmap	0x00000000
 #define ASIZ_mm_mmap	0x00000004
diff --git a/include/asm-sparc/pgtable.h b/include/asm-sparc/pgtable.h
index b0543fffb..8925923b0 100644
--- a/include/asm-sparc/pgtable.h
+++ b/include/asm-sparc/pgtable.h
@@ -1,4 +1,4 @@
-/* $Id: pgtable.h,v 1.92 2000/03/02 20:37:37 davem Exp $ */
+/* $Id: pgtable.h,v 1.93 2000/03/21 01:04:53 anton Exp $ */
 #ifndef _SPARC_PGTABLE_H
 #define _SPARC_PGTABLE_H
 
@@ -96,9 +96,12 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
 #define VMALLOC_START (0xfe300000)
 #define VMALLOC_END   ~0x0UL
 
-#define pte_ERROR(e)	__builtin_trap()
-#define pmd_ERROR(e)	__builtin_trap()
-#define pgd_ERROR(e)	__builtin_trap()
+#define pte_ERROR(e) \
+	printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
+#define pmd_ERROR(e) \
+	printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))
+#define pgd_ERROR(e) \
+	printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
 
 BTFIXUPDEF_INT(page_none)
 BTFIXUPDEF_INT(page_shared)
diff --git a/include/asm-sparc/smplock.h b/include/asm-sparc/smplock.h
index 1590fafe9..96565069c 100644
--- a/include/asm-sparc/smplock.h
+++ b/include/asm-sparc/smplock.h
@@ -8,6 +8,8 @@
 
 extern spinlock_t kernel_flag;
 
+#define kernel_locked()		spin_is_locked(&kernel_flag)
+
 /*
  * Release global kernel lock and global interrupt lock
  */