Import 2.1.115pre4

diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index f0b22b20c968e4d399adc135f455d1e1f032cb89..c1a5ecb4cc23f3d1996ba68f26880d9a8a7fcb1f 100644 (file)
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -8301,26 +8301,6 @@ CONFIG_SOUND_SONICVIBES
   differs slightly from OSS/Free, so PLEASE READ
   Documentation/sound/sonicvibes.
 
-Kernel profiling support
-CONFIG_PROFILE
-  This is for kernel hackers who want to know how much time the kernel
-  spends in the various procedures. The information is stored in
-  /proc/profile (say Y to "/proc filesystem support"!) and in order to
-  read it, you need the readprofile package from
-  sunsite.unc.edu:/pub/Linux/kernel. Its manpage gives information
-  regarding the format of profiling data. To become a kernel hacker,
-  you can start with the Kernel Hacker's Guide at
-  http://www.redhat.com:8080/HyperNews/get/khg.html (to browse the
-  WWW, you need to have access to a machine on the Internet that has a
-  program like lynx or netscape). Mere mortals say N.
-
-Profile shift count
-CONFIG_PROFILE_SHIFT
-  This is used to adjust the granularity with which the addresses of
-  executed instructions get recorded in /proc/profile. But since you
-  said Y to "Kernel profiling support", you must be a kernel hacker and
-  hence you know what this is about :-)
-
 Magic System Request Key support
 CONFIG_MAGIC_SYSRQ
   If you say Y here, you will have some control over the system even

diff --git a/arch/alpha/config.in b/arch/alpha/config.in
index 83da9b395c16b6b3a3f3aa09b184120371131352..b8f3c1794b9e6c7d5c42ce01261f189318293ff8 100644 (file)
--- a/arch/alpha/config.in
+++ b/arch/alpha/config.in
@@ -279,10 +279,6 @@ mainmenu_option next_comment
 comment 'Kernel hacking'
 
 #bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC
-bool 'Kernel profiling support' CONFIG_PROFILE
-if [ "$CONFIG_PROFILE" = "y" ]; then
-  int ' Profile shift count' CONFIG_PROFILE_SHIFT 2
-fi
 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
   tristate 'Kernel FP software completion' CONFIG_MATHEMU
 else

diff --git a/arch/alpha/defconfig b/arch/alpha/defconfig
index c8fd68be795a39d0233ee8911595d60752a64474..733f1996bb2d4cd07e103adfd34d50e2299c9bce 100644 (file)
--- a/arch/alpha/defconfig
+++ b/arch/alpha/defconfig
@@ -297,6 +297,5 @@ CONFIG_VGA_CONSOLE=y
 #
 # Kernel hacking
 #
-# CONFIG_PROFILE is not set
 CONFIG_MATHEMU=y
 # CONFIG_MAGIC_SYSRQ is not set

diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index bcf84c34e3dfc391956d85e5af533af48bb1bf1d..ba3c41563c2eca34bc79368ec69161c4964da6d9 100644 (file)
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -81,15 +81,7 @@ int cpu_idle(void *unused)
 
        current->priority = -100;
        while (1) {
-               /*
-                * tq_scheduler currently assumes we're running in a process
-                * context (ie that we hold the kernel lock..)
-                */
-               if (tq_scheduler) {
-                       lock_kernel();
-                       run_task_queue(&tq_scheduler);
-                       unlock_kernel();
-               }
+               run_task_queue(&tq_scheduler);
                /* endless idle loop with no priority at all */
                current->counter = -100;
                if (!smp_commenced || resched_needed()) {

diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 59457527ce9e2be1eebc46c86809de3ddfbe24f7..7226ed83c769c55477f18231000f791857a4b549 100644 (file)
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -1,4 +1,3 @@
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/kernel_stat.h>

diff --git a/arch/arm/config.in b/arch/arm/config.in
index fec3da3c9d16ac694c678d2b7aaea4f41a344a4a..59eae0e87bab311f02391fa7f147bc2e6bd4c5d4 100644 (file)
--- a/arch/arm/config.in
+++ b/arch/arm/config.in
@@ -169,9 +169,5 @@ comment 'Kernel hacking'
 
 bool 'Debug kernel errors' CONFIG_DEBUG_ERRORS
 #bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC
-bool 'Kernel profiling support' CONFIG_PROFILE
-if [ "$CONFIG_PROFILE" = "y" ]; then
-  int ' Profile shift count' CONFIG_PROFILE_SHIFT 2
-fi
 bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ
 endmenu

diff --git a/arch/arm/defconfig b/arch/arm/defconfig
index fb4fd97e0d96808bfd000f89e56769f3cd6d8fa8..64fb0d7ab4219c13f7ff6b85b4df10e1e085e592 100644 (file)
--- a/arch/arm/defconfig
+++ b/arch/arm/defconfig
@@ -263,5 +263,4 @@ DSP_BUFFSIZE=65536
 #
 # Kernel hacking
 #
-# CONFIG_PROFILE is not set
 CONFIG_MAGIC_SYSRQ=y

diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index 47bbe03c005ecaa821bdc2d3a07fe85ec5f499e9..03023a90943e9987ed4837f51c8086d0f773328a 100644 (file)
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -290,6 +290,4 @@ CONFIG_VGA_CONSOLE=y
 #
 # Kernel hacking
 #
-CONFIG_PROFILE=y
-CONFIG_PROFILE_SHIFT=2
 # CONFIG_MAGIC_SYSRQ is not set

diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index a04e014ec73773d14bfc4bf0c3cdc5d371a18191..657bb5f65a7f589f630f101ef61e3b2300ac173c 100644 (file)
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -159,15 +159,8 @@ int cpu_idle(void *unused)
                                !hlt_counter && !current->need_resched)
                        __asm("hlt");
                check_pgt_cache();
-               /*
-                * tq_scheduler currently assumes we're running in a process
-                * context (ie that we hold the kernel lock..)
-                */
-               if (tq_scheduler) {
-                       lock_kernel();
-                       run_task_queue(&tq_scheduler);
-                       unlock_kernel();
-               }
+               run_task_queue(&tq_scheduler);
+
                /* endless idle loop with no priority at all */
                current->counter = 0;
                schedule();

diff --git a/arch/m68k/config.in b/arch/m68k/config.in
index 8da9182ac47d5a66ff223fea81cd0941c50ab51d..43f3baa77cfc16fe05672c555c7ba18f2506d714 100644 (file)
--- a/arch/m68k/config.in
+++ b/arch/m68k/config.in
@@ -356,10 +356,6 @@ mainmenu_option next_comment
 comment 'Kernel hacking'
 
 #bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC
-bool 'Kernel profiling support' CONFIG_PROFILE
-if [ "$CONFIG_PROFILE" = "y" ]; then
-  int ' Profile shift count' CONFIG_PROFILE_SHIFT 2
-fi
 bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ
 bool 'Remote debugging support' CONFIG_KGDB
 endmenu

diff --git a/arch/m68k/defconfig b/arch/m68k/defconfig
index 2784b05dc70635e2f68c5aa35b419496edc45ebc..071884d45d871c2a045eca754417795c8311d7d5 100644 (file)
--- a/arch/m68k/defconfig
+++ b/arch/m68k/defconfig
@@ -217,5 +217,4 @@ CONFIG_AMIGA_BUILTIN_SERIAL=y
 #
 # Kernel hacking
 #
-# CONFIG_PROFILE is not set
 CONFIG_SCSI_CONSTANTS=y

diff --git a/arch/mips/config.in b/arch/mips/config.in
index 02a25620076b79511ed71d69b03dfdf4b07fc040..81a8f5c3c56c1cff3fd4803fa7a5e57bfb50a1b7 100644 (file)
--- a/arch/mips/config.in
+++ b/arch/mips/config.in
@@ -211,8 +211,4 @@ if [ "$CONFIG_MODULES" = "y" ]; then
   bool ' Build fp execption handler module' CONFIG_MIPS_FPE_MODULE
 fi
 bool 'Remote GDB kernel debugging' CONFIG_REMOTE_DEBUG
-bool 'Kernel profiling support' CONFIG_PROFILE
-if [ "$CONFIG_PROFILE" = "y" ]; then
-  int ' Profile shift count' CONFIG_PROFILE_SHIFT 2
-fi
 endmenu

diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index d7d10aa8916d11ce223ca9378b1b344eeed29ed9..68a28738f4b9d27ee56fa0c828b3acb67f0821f1 100644 (file)
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -327,4 +327,3 @@ CONFIG_SERIAL=y
 #
 CONFIG_CROSSCOMPILE=y
 # CONFIG_REMOTE_DEBUG is not set
-# CONFIG_PROFILE is not set

diff --git a/arch/ppc/amiga/bootinfo.c b/arch/ppc/amiga/bootinfo.c
index 6a9883a46a3e3b95f8071ca6aa970cce29f17b35..f24a0c5b853ca117b4f0981fb4e90af95b548aba 100644 (file)
--- a/arch/ppc/amiga/bootinfo.c
+++ b/arch/ppc/amiga/bootinfo.c
@@ -6,7 +6,6 @@
  *                              Jesper
  */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>

diff --git a/arch/ppc/amiga/time.c b/arch/ppc/amiga/time.c
index 3df64854647adb639ba6cc3709429f0b7a60781c..b14a59b53e9a1b3379ba52672acc564f8a97724b 100644 (file)
--- a/arch/ppc/amiga/time.c
+++ b/arch/ppc/amiga/time.c
@@ -1,4 +1,3 @@
-#include <linux/config.h> /* CONFIG_HEARTBEAT */
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>

diff --git a/arch/ppc/kernel/pmac_pci.c b/arch/ppc/kernel/pmac_pci.c
index 2862c6eebb651ea30e61f9dc65880cf6437e2ba8..481f69e2cd91f95a0891756c4e48c0b92d28eccb 100644 (file)
--- a/arch/ppc/kernel/pmac_pci.c
+++ b/arch/ppc/kernel/pmac_pci.c
@@ -12,7 +12,6 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/delay.h>

diff --git a/arch/ppc/kernel/pmac_time.c b/arch/ppc/kernel/pmac_time.c
index 24b21fecaf22c0c1235a26edacf75bf837c96041..a54767737b68b0286e311e5f900698a608bfe213 100644 (file)
--- a/arch/ppc/kernel/pmac_time.c
+++ b/arch/ppc/kernel/pmac_time.c
@@ -7,6 +7,7 @@
  * Paul Mackerras      August 1996.
  * Copyright (C) 1996 Paul Mackerras.
  */
+#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>

diff --git a/arch/ppc/kernel/residual.c b/arch/ppc/kernel/residual.c
index 7b975536619c8484bd330e121693bc84f4e41554..b2e198f6889051194816820047bc8269ce711dde 100644 (file)
--- a/arch/ppc/kernel/residual.c
+++ b/arch/ppc/kernel/residual.c
@@ -18,7 +18,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/string.h>
 #include <asm/residual.h>
 #include <asm/pnp.h>

diff --git a/arch/sparc/ap1000/timer.c b/arch/sparc/ap1000/timer.c
index 129b4e6d5494c88f17c1aab813efeb747b3a2856..567d240676e97ad07aa2671294254149adc0a1dd 100644 (file)
--- a/arch/sparc/ap1000/timer.c
+++ b/arch/sparc/ap1000/timer.c
@@ -7,7 +7,6 @@
   */
 /* routines to control the AP1000 timer chip */   
 
-#include <linux/config.h> /* for CONFIG_PROFILE */
 #include <linux/time.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
@@ -74,8 +73,6 @@ void ap_gettimeofday(struct timeval *xt)
        last_freerun = new_freerun;
 }
 
-#ifdef CONFIG_PROFILE
-
 static void profile_interrupt(int irq, void *dev_id, struct pt_regs * regs)
 {
   if (prof_buffer && current->pid) {
@@ -98,8 +95,6 @@ void ap_profile_init(void)
   }
 }
 
-#endif
-
 void ap_init_timers(void)
 {
        extern void timer_interrupt(int irq, void *dev_id, struct pt_regs * regs);
@@ -114,12 +109,10 @@ void ap_init_timers(void)
                    (SA_INTERRUPT | SA_STATIC_ALLOC),
                    "timer", NULL);
 
-#ifdef CONFIG_PROFILE  
        request_irq(APTIM0_IRQ,
                    profile_interrupt,
                    (SA_INTERRUPT | SA_STATIC_ALLOC),
                    "profile", NULL);
-#endif
        
        ap_clear_clock_irq();
        

diff --git a/arch/sparc/config.in b/arch/sparc/config.in
index 2d9ea0ccbec12adc5fa082b0c4a892e5f1cef689..f29bf95768038e95d2d28c0f327f31289d9d8bd4 100644 (file)
--- a/arch/sparc/config.in
+++ b/arch/sparc/config.in
@@ -185,9 +185,5 @@ endmenu
 mainmenu_option next_comment
 comment 'Kernel hacking'
 
-bool 'Kernel profiling support' CONFIG_PROFILE
-if [ "$CONFIG_PROFILE" = "y" ]; then
-       int ' Profile shift count' CONFIG_PROFILE_SHIFT 2
-fi
 bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ
 endmenu

diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig
index 9e21700d4324393098aad5343626d27b4f269983..52801ae6827fff67b7c10ea8f468a1e7716f9949 100644 (file)
--- a/arch/sparc/defconfig
+++ b/arch/sparc/defconfig
@@ -315,5 +315,4 @@ CONFIG_NLS=y
 #
 # Kernel hacking
 #
-# CONFIG_PROFILE is not set
 # CONFIG_MAGIC_SYSRQ is not set

diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c
index 8ae16dc7ad8d17db0e38c7979f46e8530c3b33c3..c52674431316fcdea7f3f58a78cf85ddb9a8e47e 100644 (file)
--- a/arch/sparc/kernel/process.c
+++ b/arch/sparc/kernel/process.c
@@ -113,15 +113,7 @@ int cpu_idle(void *unused)
        current->priority = -100;
        while(1) {
                srmmu_check_pgt_cache();
-               /*
-                * tq_scheduler currently assumes we're running in a process
-                * context (ie that we hold the kernel lock..)
-                */
-               if (tq_scheduler) {
-                       lock_kernel();
-                       run_task_queue(&tq_scheduler);
-                       unlock_kernel();
-               }
+               run_task_queue(&tq_scheduler);
                /* endless idle loop with no priority at all */
                current->counter = -100;
                if(!smp_commenced || current->need_resched)

diff --git a/arch/sparc/kernel/sun4c_irq.c b/arch/sparc/kernel/sun4c_irq.c
index e2ef04ce780d46dfaac687ce392e1707d969e8c3..cda7564dc0c937ab5cffbc3d584e3ef85425931d 100644 (file)
--- a/arch/sparc/kernel/sun4c_irq.c
+++ b/arch/sparc/kernel/sun4c_irq.c
@@ -9,6 +9,7 @@
  *  Copyright (C) 1996 Dave Redman (djhr@tadpole.co.uk)
  */
 
+#include <linux/config.h>
 #include <linux/ptrace.h>
 #include <linux/errno.h>
 #include <linux/linkage.h>

diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index 37befcc1d9d6137d50a08ff6fe9574040cc88f5e..5563a0cc66eaba4e66f30fe6c0050ae8a889cdda 100644 (file)
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -6,7 +6,6 @@
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
  */
 
-#include <linux/config.h> /* for CONFIG_PROFILE */
 #include <asm/head.h>
 
 #include <linux/kernel.h>
@@ -437,8 +436,6 @@ void smp4d_message_pass(int target, int msg, unsigned long data, int wait)
 /* Protects counters touched during level14 ticker */
 static spinlock_t ticker_lock = SPIN_LOCK_UNLOCKED;
 
-#ifdef CONFIG_PROFILE
-
 /* 32-bit Sparc specific profiling function. */
 static inline void sparc_do_profile(unsigned long pc)
 {
@@ -457,8 +454,6 @@ static inline void sparc_do_profile(unsigned long pc)
        }
 }
 
-#endif
-
 extern unsigned int prof_multiplier[NR_CPUS];
 extern unsigned int prof_counter[NR_CPUS];
 
@@ -484,10 +479,9 @@ void smp4d_percpu_timer_interrupt(struct pt_regs *regs)
                show_leds(cpu);
        }
 
-#ifdef CONFIG_PROFILE
        if(!user_mode(regs))
                sparc_do_profile(regs->pc);
-#endif
+
        if(!--prof_counter[cpu]) {
                int user = user_mode(regs);
                if(current->pid) {

diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c
index 97cea66aaedcb2e765d95def4c756fe1b1e57559..597ee76658b3e8d4b1ee4bdaf7bd3dd0effa3caf 100644 (file)
--- a/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
@@ -3,7 +3,6 @@
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
  */
 
-#include <linux/config.h> /* for CONFIG_PROFILE */
 #include <asm/head.h>
 
 #include <linux/kernel.h>
@@ -433,8 +432,6 @@ void smp4m_cross_call_irq(void)
 /* Protects counters touched during level14 ticker */
 static spinlock_t ticker_lock = SPIN_LOCK_UNLOCKED;
 
-#ifdef CONFIG_PROFILE
-
 /* 32-bit Sparc specific profiling function. */
 static inline void sparc_do_profile(unsigned long pc)
 {
@@ -453,8 +450,6 @@ static inline void sparc_do_profile(unsigned long pc)
        }
 }
 
-#endif
-
 extern unsigned int prof_multiplier[NR_CPUS];
 extern unsigned int prof_counter[NR_CPUS];
 
@@ -467,10 +462,10 @@ void smp4m_percpu_timer_interrupt(struct pt_regs *regs)
        int cpu = smp_processor_id();
 
        clear_profile_irq(mid_xlate[cpu]);
-#ifdef CONFIG_PROFILE
+
        if(!user_mode(regs))
                sparc_do_profile(regs->pc);
-#endif
+
        if(!--prof_counter[cpu]) {
                int user = user_mode(regs);
                if(current->pid) {

diff --git a/arch/sparc/kernel/sun4setup.c b/arch/sparc/kernel/sun4setup.c
index aa4fe4fbd780fa9bb7bfb63cb62078aecec6e0a2..28bd7ce95292f6a17774bdd322b54543b9ca355c 100644 (file)
--- a/arch/sparc/kernel/sun4setup.c
+++ b/arch/sparc/kernel/sun4setup.c
@@ -4,8 +4,6 @@
  * Copyright (C) 1998 Chris G. Davis (cdavis@cois.on.ca)
  */
 
-#include <linux/config.h>
-
 #include <asm/page.h>
 #include <asm/oplib.h>
 #include <asm/idprom.h>

diff --git a/arch/sparc64/config.in b/arch/sparc64/config.in
index c4ba57d0b2c59b1ebc966f0199b91031561ee27d..2caead01d11526d41529b9d0f3aacab378a6d080 100644 (file)
--- a/arch/sparc64/config.in
+++ b/arch/sparc64/config.in
@@ -245,10 +245,6 @@ endmenu
 mainmenu_option next_comment
 comment 'Kernel hacking'
 
-bool 'Kernel profiling support' CONFIG_PROFILE
-if [ "$CONFIG_PROFILE" = "y" ]; then
-       int ' Profile shift count' CONFIG_PROFILE_SHIFT 2
-fi
 bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ
 bool 'ECache flush trap support at ta 0x72' CONFIG_EC_FLUSH_TRAP
 endmenu

diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 3084facab8c5fb3adcc3ef027f190bfcbfd262da..35f1219fd9c0f13a5d172435a803819c73295d8e 100644 (file)
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -334,6 +334,5 @@ CONFIG_NLS=y
 #
 # Kernel hacking
 #
-# CONFIG_PROFILE is not set
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_EC_FLUSH_TRAP is not set

diff --git a/arch/sparc64/kernel/.#entry.S.1.84 b/arch/sparc64/kernel/.#entry.S.1.84
deleted file mode 100644 (file)
index eee12ca..0000000
--- a/arch/sparc64/kernel/.#entry.S.1.84
+++ /dev/null
@@ -1,783 +0,0 @@
-/* $Id: entry.S,v 1.84 1998/06/15 16:59:36 jj Exp $
- * arch/sparc64/kernel/entry.S:  Sparc64 trap low-level entry points.
- *
- * Copyright (C) 1995,1997 David S. Miller (davem@caip.rutgers.edu)
- * Copyright (C) 1996 Eddie C. Dost        (ecd@skynet.be)
- * Copyright (C) 1996 Miguel de Icaza      (miguel@nuclecu.unam.mx)
- * Copyright (C) 1996,1998 Jakub Jelinek   (jj@sunsite.mff.cuni.cz)
- */
-
-#include <linux/config.h>
-#include <linux/errno.h>
-
-#include <asm/head.h>
-#include <asm/asi.h>
-#include <asm/smp.h>
-#include <asm/ptrace.h>
-#include <asm/page.h>
-#include <asm/signal.h>
-#include <asm/pgtable.h>
-#include <asm/processor.h>
-#include <asm/visasm.h>
-
-/* #define SYSCALL_TRACING */
-
-#define curptr      g6
-
-#define NR_SYSCALLS 256      /* Each OS is different... */
-
-       .text
-       .align          32
-
-       /* This is trivial with the new code... */
-       .align          32
-       .globl          do_fpdis
-do_fpdis:
-       ldub            [%g6 + AOFF_task_tss + AOFF_thread_fpsaved], %g5        ! Load  Group
-       sethi           %hi(TSTATE_PEF), %g4                                    ! IEU0
-       wr              %g0, FPRS_FEF, %fprs                                    ! LSU   Group+4bubbles
-       andcc           %g5, FPRS_FEF, %g0                                      ! IEU1  Group
-       be,a,pt         %icc, 1f                                                ! CTI
-        clr            %g7                                                     ! IEU0
-       ldub            [%g6 + AOFF_task_tss + AOFF_thread_gsr], %g7            ! Load  Group
-1:     andcc           %g5, FPRS_DL, %g0                                       ! IEU1
-       bne,pn          %icc, 2f                                                ! CTI
-        fzero          %f0                                                     ! FPA
-       andcc           %g5, FPRS_DU, %g0                                       ! IEU1  Group
-       bne,pn          %icc, 1f                                                ! CTI
-        fzero          %f2                                                     ! FPA
-       faddd           %f0, %f2, %f4
-       fmuld           %f0, %f2, %f6
-       faddd           %f0, %f2, %f8
-       fmuld           %f0, %f2, %f10
-       faddd           %f0, %f2, %f12
-       fmuld           %f0, %f2, %f14
-       faddd           %f0, %f2, %f16
-       fmuld           %f0, %f2, %f18
-       faddd           %f0, %f2, %f20
-       fmuld           %f0, %f2, %f22
-       faddd           %f0, %f2, %f24
-       fmuld           %f0, %f2, %f26
-       faddd           %f0, %f2, %f28
-       fmuld           %f0, %f2, %f30
-       faddd           %f0, %f2, %f32
-       fmuld           %f0, %f2, %f34
-       faddd           %f0, %f2, %f36
-       fmuld           %f0, %f2, %f38
-       faddd           %f0, %f2, %f40
-       fmuld           %f0, %f2, %f42
-       faddd           %f0, %f2, %f44
-       fmuld           %f0, %f2, %f46
-       faddd           %f0, %f2, %f48
-       fmuld           %f0, %f2, %f50
-       faddd           %f0, %f2, %f52
-       fmuld           %f0, %f2, %f54
-       faddd           %f0, %f2, %f56
-       fmuld           %f0, %f2, %f58
-       b,pt            %xcc, fpdis_exit2
-        faddd          %f0, %f2, %f60
-1:     mov             SECONDARY_CONTEXT, %g3
-       add             %g6, AOFF_task_fpregs + 0x80, %g1
-       faddd           %f0, %f2, %f4
-       fmuld           %f0, %f2, %f6
-       ldxa            [%g3] ASI_DMMU, %g5
-       add             %g6, AOFF_task_fpregs + 0xc0, %g2
-       stxa            %g0, [%g3] ASI_DMMU
-       faddd           %f0, %f2, %f8
-       fmuld           %f0, %f2, %f10
-       flush           %g6
-       membar          #StoreLoad | #LoadLoad
-       ldda            [%g1] ASI_BLK_S, %f32   ! grrr, where is ASI_BLK_NUCLEUS 8-(
-       ldda            [%g2] ASI_BLK_S, %f48
-       faddd           %f0, %f2, %f12
-       fmuld           %f0, %f2, %f14
-       faddd           %f0, %f2, %f16
-       fmuld           %f0, %f2, %f18
-       faddd           %f0, %f2, %f20
-       fmuld           %f0, %f2, %f22
-       faddd           %f0, %f2, %f24
-       fmuld           %f0, %f2, %f26
-       faddd           %f0, %f2, %f28
-       fmuld           %f0, %f2, %f30
-       b,pt            %xcc, fpdis_exit
-        membar         #Sync
-2:     andcc           %g5, FPRS_DU, %g0
-       bne,pt          %icc, 3f
-        fzero          %f32
-       mov             SECONDARY_CONTEXT, %g3
-       fzero           %f34
-       ldxa            [%g3] ASI_DMMU, %g5
-       add             %g6, AOFF_task_fpregs, %g1
-       stxa            %g0, [%g3] ASI_DMMU
-       add             %g6, AOFF_task_fpregs + 0x40, %g2
-       faddd           %f32, %f34, %f36
-       fmuld           %f32, %f34, %f38
-       flush           %g6
-       membar          #StoreLoad | #LoadLoad
-       ldda            [%g1] ASI_BLK_S, %f0    ! grrr, where is ASI_BLK_NUCLEUS 8-(
-       ldda            [%g2] ASI_BLK_S, %f16
-       faddd           %f32, %f34, %f40
-       fmuld           %f32, %f34, %f42
-       faddd           %f32, %f34, %f44
-       fmuld           %f32, %f34, %f46
-       faddd           %f32, %f34, %f48
-       fmuld           %f32, %f34, %f50
-       faddd           %f32, %f34, %f52
-       fmuld           %f32, %f34, %f54
-       faddd           %f32, %f34, %f56
-       fmuld           %f32, %f34, %f58
-       faddd           %f32, %f34, %f60
-       fmuld           %f32, %f34, %f62
-       b,pt            %xcc, fpdis_exit
-        membar         #Sync
-3:     mov             SECONDARY_CONTEXT, %g3
-       add             %g6, AOFF_task_fpregs, %g1
-       ldxa            [%g3] ASI_DMMU, %g5
-       mov             0x40, %g2
-       stxa            %g0, [%g3] ASI_DMMU
-       flush           %g6
-       membar          #StoreLoad | #LoadLoad
-       ldda            [%g1] ASI_BLK_S, %f0            ! grrr, where is ASI_BLK_NUCLEUS 8-(
-       ldda            [%g1 + %g2] ASI_BLK_S, %f16
-       add             %g1, 0x80, %g1
-       ldda            [%g1] ASI_BLK_S, %f32
-       ldda            [%g1 + %g2] ASI_BLK_S, %f48
-       membar          #Sync
-fpdis_exit:
-       stxa            %g5, [%g3] ASI_DMMU
-       flush           %g6
-fpdis_exit2:
-       wr              %g7, 0, %gsr
-       ldx             [%g6 + AOFF_task_tss + AOFF_thread_xfsr], %fsr
-       rdpr            %tstate, %g3
-       or              %g3, %g4, %g3           ! anal...
-       wrpr            %g3, %tstate
-       wr              %g0, FPRS_FEF, %fprs    ! clean DU/DL bits
-       retry
-
-       /* The registers for cross calls will be:
-        *
-        * DATA 0: [low 32-bits]  Address of function to call, jmp to this
-        *         [high 32-bits] MMU Context Argument 0, place in %g5
-        * DATA 1: Address Argument 1, place in %g6
-        * DATA 2: Address Argument 2, place in %g7
-        *
-        * With this method we can do most of the cross-call tlb/cache
-        * flushing very quickly.
-        */
-       .data
-       .align  8
-       .globl  ivec_spurious_cookie
-ivec_spurious_cookie:  .xword  0
-
-       .text
-       .align  32
-       .globl  do_ivec
-do_ivec:
-       ldxa            [%g0] ASI_INTR_RECEIVE, %g5
-       andcc           %g5, 0x20, %g0
-       be,pn           %xcc, do_ivec_return
-        mov            0x40, %g2
-
-       /* Load up Interrupt Vector Data 0 register. */
-       sethi           %hi(KERNBASE), %g4
-       ldxa            [%g2] ASI_UDB_INTR_R, %g3
-       cmp             %g3, %g4
-       bgeu,pn         %xcc, do_ivec_xcall
-        nop
-       and             %g3, 0x7ff, %g3
-       sllx            %g3, 3, %g3
-       ldx             [%g1 + %g3], %g2
-       brz,pn          %g2, do_ivec_spurious
-        sethi          %hi(0x80000000), %g5
-
-       or              %g2, %g5, %g2
-       stx             %g2, [%g1 + %g3]
-
-       /* No branches, worse case we don't know about this interrupt
-        * yet, so we would just write a zero into the softint register
-        * which is completely harmless.
-        */
-       wr              %g2, 0x0, %set_softint
-do_ivec_return:
-       stxa            %g0, [%g0] ASI_INTR_RECEIVE
-       membar          #Sync
-       retry
-do_ivec_xcall:
-       srlx            %g3, 32, %g5
-       add             %g2, 0x10, %g2
-       srl             %g3, 0, %g3
-       ldxa            [%g2] ASI_UDB_INTR_R, %g6
-       add             %g2, 0x10, %g2
-       ldxa            [%g2] ASI_UDB_INTR_R, %g7
-       stxa            %g0, [%g0] ASI_INTR_RECEIVE
-       membar          #Sync
-       jmpl            %g3, %g0
-        nop
-
-do_ivec_spurious:
-       srl             %g3, 3, %g3
-       sethi           %hi(ivec_spurious_cookie), %g2
-       stx             %g3, [%g2 + %lo(ivec_spurious_cookie)]
-       stxa            %g0, [%g0] ASI_INTR_RECEIVE
-       membar          #Sync
-       rdpr            %pstate, %g5
-       wrpr            %g5, PSTATE_IG | PSTATE_AG, %pstate
-       sethi           %hi(109f), %g7
-       ba,pt           %xcc, etrap
-109:    or             %g7, %lo(109b), %g7
-       call            report_spurious_ivec
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
-       ba,pt           %xcc, rtrap
-        clr            %l6
-
-       .globl          getcc, setcc
-getcc:
-       ldx             [%o0 + PT_V9_TSTATE], %o1
-       srlx            %o1, 32, %o1
-       and             %o1, 0xf, %o1
-       retl
-        stx            %o1, [%o0 + PT_V9_G1]
-setcc:
-       ldx             [%o0 + PT_V9_TSTATE], %o1
-       ldx             [%o0 + PT_V9_G1], %o2
-       or              %g0, %ulo(TSTATE_ICC), %o3
-       sllx            %o3, 32, %o3
-       andn            %o1, %o3, %o1
-       sllx            %o2, 32, %o2
-       and             %o2, %o3, %o2
-       or              %o1, %o2, %o1
-       retl
-        stx            %o1, [%o0 + PT_V9_TSTATE]
-
-       .globl          utrap, utrap_ill
-utrap: brz,pn          %g1, etrap
-        nop
-       save            %sp, -128, %sp
-       rdpr            %tstate, %l6
-       rdpr            %cwp, %l7
-       andn            %l6, TSTATE_CWP, %l6
-       wrpr            %l6, %l7, %tstate
-       rdpr            %tpc, %l6
-       rdpr            %tnpc, %l7
-       wrpr            %g1, 0, %tnpc
-       done
-utrap_ill:
-        call           bad_trap
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
-       ba,pt           %xcc, rtrap
-        clr            %l6
-
-#ifdef CONFIG_BLK_DEV_FD
-       .globl          floppy_hardint
-floppy_hardint:
-       wr              %g0, (1 << 11), %clear_softint
-       sethi           %hi(doing_pdma), %g1
-       ld              [%g1 + %lo(doing_pdma)], %g2
-       brz,pn          %g2, floppy_dosoftint
-        sethi          %hi(fdc_status), %g3
-       ldx             [%g3 + %lo(fdc_status)], %g3
-       sethi           %hi(pdma_vaddr), %g5
-       ldx             [%g5 + %lo(pdma_vaddr)], %g4
-       sethi           %hi(pdma_size), %g5
-       ldx             [%g5 + %lo(pdma_size)], %g5
-
-next_byte:
-       ldub            [%g3], %g7
-       andcc           %g7, 0x80, %g0
-       be,pn           %icc, floppy_fifo_emptied
-        andcc          %g7, 0x20, %g0
-       be,pn           %icc, floppy_overrun
-        andcc          %g7, 0x40, %g0
-       be,pn           %icc, floppy_write
-        sub            %g5, 1, %g5
-
-       ldub            [%g3 + 1], %g7
-       orcc            %g0, %g5, %g0
-       stb             %g7, [%g4]
-       bne,pn          %xcc, next_byte
-        add            %g4, 1, %g4
-
-       b,pt            %xcc, floppy_tdone
-        nop
-
-floppy_write:
-       ldub            [%g4], %g7
-       orcc            %g0, %g5, %g0
-       stb             %g7, [%g3 + 1]
-       bne,pn          %xcc, next_byte
-        add            %g4, 1, %g4
-
-floppy_tdone:
-       sethi           %hi(pdma_vaddr), %g1
-       stx             %g4, [%g1 + %lo(pdma_vaddr)]
-       sethi           %hi(pdma_size), %g1
-       stx             %g5, [%g1 + %lo(pdma_size)]
-       sethi           %hi(auxio_register), %g1
-       ldx             [%g1 + %lo(auxio_register)], %g7
-       ldub            [%g7], %g5
-       or              %g5, 0xc2, %g5
-       stb             %g5, [%g7]
-       andn            %g5, 0x02, %g5
-
-       nop; nop;  nop; nop;  nop; nop;
-       nop; nop;  nop; nop;  nop; nop;
-
-       stb             %g5, [%g7]
-       sethi           %hi(doing_pdma), %g1
-       b,pt            %xcc, floppy_dosoftint
-        st             %g0, [%g1 + %lo(doing_pdma)]
-
-floppy_fifo_emptied:
-       sethi           %hi(pdma_vaddr), %g1
-       stx             %g4, [%g1 + %lo(pdma_vaddr)]
-       sethi           %hi(pdma_size), %g1
-       stx             %g5, [%g1 + %lo(pdma_size)]
-       sethi           %hi(irq_action), %g1
-       or              %g1, %lo(irq_action), %g1
-       ldx             [%g1 + (11 << 3)], %g3          ! irqaction[floppy_irq]
-       ldx             [%g3 + 0x10], %g4               ! action->mask == ino_bucket ptr
-       ldx             [%g4 + 0x18], %g4               ! bucket->iclr
-       stw             %g0, [%g4]                      ! SYSIO_ICLR_IDLE
-       membar          #Sync                           ! probably not needed...
-       retry
-
-floppy_overrun:
-       sethi           %hi(pdma_vaddr), %g1
-       stx             %g4, [%g1 + %lo(pdma_vaddr)]
-       sethi           %hi(pdma_size), %g1
-       stx             %g5, [%g1 + %lo(pdma_size)]
-       sethi           %hi(doing_pdma), %g1
-       st              %g0, [%g1 + %lo(doing_pdma)]
-
-floppy_dosoftint:
-       rdpr            %pil, %g2
-       wrpr            %g0, 15, %pil
-       sethi           %hi(109f), %g7
-       b,pt            %xcc, etrap_irq
-109:    or             %g7, %lo(109b), %g7
-
-       mov             11, %o0
-       mov             0, %o1
-       call            sparc_floppy_irq
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o2
-
-       b,pt            %xcc, rtrap
-        clr            %l6
-
-#endif /* CONFIG_BLK_DEV_FD */
-
-       /* XXX Here is stuff we still need to write... -DaveM XXX */
-       .globl          netbsd_syscall
-netbsd_syscall:
-       retl
-        nop
-
-       .globl          do_mna
-do_mna:
-       rdpr            %tl, %g3
-       cmp             %g3, 1
-       bgu,a,pn        %icc, winfix_mna
-        rdpr           %tpc, %g3
-       mov             DMMU_SFAR, %g4
-       mov             TLB_SFSR, %g5
-       sethi           %hi(109f), %g7
-       ldxa            [%g4] ASI_DMMU, %g4
-       ldxa            [%g5] ASI_DMMU, %g5
-       ba,pt           %xcc, etrap
-109:    or             %g7, %lo(109b), %g7
-       mov             %l4, %o1
-       mov             %l5, %o2
-       call            mem_address_unaligned
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
-       ba,pt           %xcc, rtrap
-        clr            %l6
-
-       .globl          do_lddfmna
-do_lddfmna:
-       mov             DMMU_SFAR, %g4
-       mov             TLB_SFSR, %g5
-       sethi           %hi(109f), %g7
-       ldxa            [%g4] ASI_DMMU, %g4
-       ldxa            [%g5] ASI_DMMU, %g5
-       ba,pt           %xcc, etrap
-109:    or             %g7, %lo(109b), %g7
-       mov             %l4, %o1
-       mov             %l5, %o2
-       call            handle_lddfmna
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
-       ba,pt           %xcc, rtrap
-        clr            %l6
-
-       .globl          do_stdfmna
-do_stdfmna:
-       mov             DMMU_SFAR, %g4
-       mov             TLB_SFSR, %g5
-       sethi           %hi(109f), %g7
-       ldxa            [%g4] ASI_DMMU, %g4
-       ldxa            [%g5] ASI_DMMU, %g5
-       ba,pt           %xcc, etrap
-109:    or             %g7, %lo(109b), %g7
-       mov             %l4, %o1
-       mov             %l5, %o2
-       call            handle_stdfmna
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
-       ba,pt           %xcc, rtrap
-        clr            %l6
-
-       .globl  breakpoint_trap
-breakpoint_trap:
-       call            sparc_breakpoint
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o0
-       ba,pt           %xcc, rtrap
-        nop
-
-       /* SunOS uses syscall zero as the 'indirect syscall' it looks
-        * like indir_syscall(scall_num, arg0, arg1, arg2...);  etc.
-        * This is complete brain damage.
-        */
-       .globl  sunos_indir
-sunos_indir:
-       srl             %o0, 0, %o0
-       mov             %o7, %l4
-       cmp             %o0, NR_SYSCALLS
-       blu,a,pt        %icc, 1f
-        sll            %o0, 0x2, %o0
-       sethi           %hi(sunos_nosys), %l6
-       b,pt            %xcc, 2f
-        or             %l6, %lo(sunos_nosys), %l6
-1:     sethi           %hi(sunos_sys_table), %l7
-       or              %l7, %lo(sunos_sys_table), %l7
-       lduw            [%l7 + %o0], %l6
-2:     mov             %o1, %o0
-       mov             %o2, %o1
-       mov             %o3, %o2
-       mov             %o4, %o3
-       mov             %o5, %o4
-       call            %l6
-        mov            %l4, %o7
-
-       .globl  sunos_getpid
-sunos_getpid:
-       call    sys_getppid
-        nop
-       call    sys_getpid
-        stx    %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I1]
-       b,pt    %xcc, ret_sys_call
-        stx    %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
-
-       /* SunOS getuid() returns uid in %o0 and euid in %o1 */
-       .globl  sunos_getuid
-sunos_getuid:
-       call    sys_geteuid
-        nop
-       call    sys_getuid
-        stx    %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I1]
-       b,pt    %xcc, ret_sys_call
-        stx    %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
-
-       /* SunOS getgid() returns gid in %o0 and egid in %o1 */
-       .globl  sunos_getgid
-sunos_getgid:
-       call    sys_getegid
-        nop
-       call    sys_getgid
-        stx    %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I1]
-       b,pt    %xcc, ret_sys_call
-        stx    %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
-
-       /* SunOS's execv() call only specifies the argv argument, the
-        * environment settings are the same as the calling processes.
-        */
-       .globl  sunos_execv
-sunos_execv:
-       sethi   %hi(sparc32_execve), %g1
-       stx     %g0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I2]
-       jmpl    %g1 + %lo(sparc32_execve), %g0
-        add    %sp, STACK_BIAS + REGWIN_SZ, %o0
-
-       .globl  sys_pipe, sys_execve, sys_sigpause, sys_nis_syscall
-       .globl  sys_sigsuspend, sys_rt_sigsuspend, sys32_rt_sigsuspend
-       .globl  sys_sigreturn, sys_rt_sigreturn
-       .globl  sys32_sigreturn, sys32_rt_sigreturn
-       .globl  sys32_execve, sys_ptrace
-       .align  32
-sys_pipe:      sethi           %hi(sparc_pipe), %g1
-               add             %sp, STACK_BIAS + REGWIN_SZ, %o0
-               jmpl            %g1 + %lo(sparc_pipe), %g0
-                nop
-sys_nis_syscall:sethi          %hi(c_sys_nis_syscall), %g1
-               add             %sp, STACK_BIAS + REGWIN_SZ, %o0
-               jmpl            %g1 + %lo(c_sys_nis_syscall), %g0
-                nop
-
-sys_execve:    sethi           %hi(sparc_execve), %g1
-               add             %sp, STACK_BIAS + REGWIN_SZ, %o0
-               jmpl            %g1 + %lo(sparc_execve), %g0
-                nop
-sys32_execve:  sethi           %hi(sparc32_execve), %g1
-               add             %sp, STACK_BIAS + REGWIN_SZ, %o0
-               jmpl            %g1 + %lo(sparc32_execve), %g0
-                nop
-sys_memory_ordering:
-               sethi           %hi(sparc_memory_ordering), %g1
-               add             %sp, STACK_BIAS + REGWIN_SZ, %o1
-               jmpl            %g1 + %lo(sparc_memory_ordering), %g0
-                nop
-
-               .align          32
-sys_sigsuspend:        add             %sp, STACK_BIAS + REGWIN_SZ, %o0
-               call            do_sigsuspend
-                add            %o7, 1f-.-4, %o7
-               nop
-sys_rt_sigsuspend: /* NOTE: %o0,%o1 have a correct value already */
-               add             %sp, STACK_BIAS + REGWIN_SZ, %o2
-               call            do_rt_sigsuspend
-                add            %o7, 1f-.-4, %o7
-               nop
-sys32_rt_sigsuspend: /* NOTE: %o0,%o1 have a correct value already */
-               srl             %o0, 0, %o0
-               add             %sp, STACK_BIAS + REGWIN_SZ, %o2
-               call            do_rt_sigsuspend32
-                add            %o7, 1f-.-4, %o7
-               /* NOTE: %o0 has a correct value already */
-sys_sigpause:  add             %sp, STACK_BIAS + REGWIN_SZ, %o1
-               call            do_sigpause
-                add            %o7, 1f-.-4, %o7
-               nop
-sys_sigreturn: add             %sp, STACK_BIAS + REGWIN_SZ, %o0
-               call            do_sigreturn
-                add            %o7, 1f-.-4, %o7
-               nop
-sys32_sigreturn:
-               add             %sp, STACK_BIAS + REGWIN_SZ, %o0
-               call            do_sigreturn32
-                add            %o7, 1f-.-4, %o7
-               nop
-sys_rt_sigreturn:
-               add             %sp, STACK_BIAS + REGWIN_SZ, %o0
-               call            do_rt_sigreturn
-                add            %o7, 1f-.-4, %o7
-               nop
-sys32_rt_sigreturn:
-               add             %sp, STACK_BIAS + REGWIN_SZ, %o0
-               call            do_rt_sigreturn32
-                add            %o7, 1f-.-4, %o7
-               nop
-sys_ptrace:    add             %sp, STACK_BIAS + REGWIN_SZ, %o0
-               call            do_ptrace
-                add            %o7, 1f-.-4, %o7
-               nop
-               .align          32
-1:             ldx             [%curptr + AOFF_task_flags], %l5
-               andcc           %l5, 0x20, %g0
-               be,pt           %icc, rtrap
-                clr            %l6
-               call            syscall_trace
-                nop
-
-               ba,pt           %xcc, rtrap
-                clr            %l6
-
-       /* This is how fork() was meant to be done, 8 instruction entry.
-        *
-        * I questioned the following code briefly, let me clear things
-        * up so you must not reason on it like I did.
-        *
-        * Know the fork_kpsr etc. we use in the sparc32 port?  We don't
-        * need it here because the only piece of window state we copy to
-        * the child is the CWP register.  Even if the parent sleeps,
-        * we are safe because we stuck it into pt_regs of the parent
-        * so it will not change.
-        *
-        * XXX This raises the question, whether we can do the same on
-        * XXX sparc32 to get rid of fork_kpsr _and_ fork_kwim.  The
-        * XXX answer is yes.  We stick fork_kpsr in UREG_G0 and
-        * XXX fork_kwim in UREG_G1 (global registers are considered
-        * XXX volatile across a system call in the sparc ABI I think
-        * XXX if it isn't we can use regs->y instead, anyone who depends
-        * XXX upon the Y register being preserved across a fork deserves
-        * XXX to lose).
-        *
-        * In fact we should take advantage of that fact for other things
-        * during system calls...
-        */
-       .globl  sys_fork, sys_vfork, sys_clone, sparc_exit
-       .globl  ret_from_syscall
-       .align  32
-sys_fork:
-sys_vfork:     mov             SIGCHLD, %o0
-               clr             %o1
-sys_clone:     flushw
-               mov             %o7, %l5
-               add             %sp, STACK_BIAS + REGWIN_SZ, %o2
-               movrz           %o1, %fp, %o1
-               call            do_fork
-                mov            %l5, %o7
-ret_from_syscall:
-               /* Clear SPARC_FLAG_NEWCHILD, switch_to leaves tss.flags in
-                * %o7 for us.
-                */
-               andn            %o7, 0x100, %o7
-               sth             %o7, [%g6 + AOFF_task_tss + AOFF_thread_flags]
-#ifdef __SMP__
-               sethi           %hi(scheduler_lock), %o4
-               membar          #StoreStore | #LoadStore
-               stb             %g0, [%o4 + %lo(scheduler_lock)]
-#endif
-               b,pt            %xcc, ret_sys_call
-                ldx            [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0], %o0
-sparc_exit:    rdpr            %otherwin, %g1
-               rdpr            %pstate, %g2
-               wrpr            %g2, PSTATE_IE, %pstate
-               rdpr            %cansave, %g3
-               add             %g3, %g1, %g3
-               wrpr            %g3, 0x0, %cansave
-               wrpr            %g0, 0x0, %otherwin
-               wrpr            %g2, 0x0, %pstate
-               mov             %o7, %l5
-               sth             %g0, [%g6 + AOFF_task_tss + AOFF_thread_w_saved]
-               call            sys_exit
-                mov            %l5, %o7
-
-linux_sparc_ni_syscall:
-       sethi           %hi(sys_ni_syscall), %l7
-       b,pt            %xcc, 4f
-        or             %l7, %lo(sys_ni_syscall), %l7
-
-linux_syscall_trace32:
-       call            syscall_trace
-        nop
-       srl             %i0, 0, %o0
-       mov             %i4, %o4
-       srl             %i1, 0, %o1
-       srl             %i2, 0, %o2
-       b,pt            %xcc, 2f
-        srl            %i3, 0, %o3
-
-linux_syscall_trace:
-       call            syscall_trace
-        nop
-       mov             %i0, %o0
-       mov             %i1, %o1
-       mov             %i2, %o2
-       mov             %i3, %o3
-       b,pt            %xcc, 2f
-        mov            %i4, %o4
-
-
-       /* Linux 32-bit and SunOS system calls enter here... */
-       .align  32
-       .globl  linux_sparc_syscall32
-linux_sparc_syscall32:
-       /* Direct access to user regs, must faster. */
-       cmp             %g1, NR_SYSCALLS                        ! IEU1  Group
-       bgeu,pn         %xcc, linux_sparc_ni_syscall            ! CTI
-        srl            %i0, 0, %o0                             ! IEU0
-       sll             %g1, 2, %l4                             ! IEU0  Group
-#ifdef SYSCALL_TRACING
-       add             %sp, STACK_BIAS + REGWIN_SZ, %o1
-       call            syscall_trace_entry
-        mov            %g1, %o0
-       srl             %i0, 0, %o0
-#endif
-       mov             %i4, %o4                                ! IEU1
-       lduw            [%l7 + %l4], %l7                        ! Load
-       srl             %i1, 0, %o1                             ! IEU0  Group
-       ldx             [%curptr + AOFF_task_flags], %l0        ! Load
-
-       mov             %i5, %o5                                ! IEU1
-       srl             %i2, 0, %o2                             ! IEU0  Group
-       mov             %i0, %l5                                ! IEU1
-       andcc           %l0, 0x20, %g0                          ! IEU1  Group
-       bne,pn          %icc, linux_syscall_trace32             ! CTI
-        srl            %i3, 0, %o3                             ! IEU0
-       call            %l7                                     ! CTI   Group brk forced
-        add            %o7, 3f-.-4, %o7                        ! IEU0
-
-       /* Linux native and SunOS system calls enter here... */
-       .align  32
-       .globl  linux_sparc_syscall, ret_sys_call
-linux_sparc_syscall:
-       /* Direct access to user regs, must faster. */
-       cmp             %g1, NR_SYSCALLS                        ! IEU1  Group
-       bgeu,pn         %xcc, linux_sparc_ni_syscall            ! CTI
-        mov            %i0, %o0                                ! IEU0
-       sll             %g1, 2, %l4                             ! IEU0  Group
-#ifdef SYSCALL_TRACING
-       add             %sp, STACK_BIAS + REGWIN_SZ, %o1
-       call            syscall_trace_entry
-        mov            %g1, %o0
-       mov             %i0, %o0
-#endif
-       mov             %i1, %o1                                ! IEU1
-       lduw            [%l7 + %l4], %l7                        ! Load
-4:     mov             %i2, %o2                                ! IEU0  Group
-       ldx             [%curptr + AOFF_task_flags], %l0        ! Load
-
-       mov             %i3, %o3                                ! IEU1
-       mov             %i4, %o4                                ! IEU0  Group
-       andcc           %l0, 0x20, %g0                          ! IEU1  Group+1 bubble
-       bne,pn          %icc, linux_syscall_trace               ! CTI   Group
-        mov            %i0, %l5                                ! IEU0
-2:     call            %l7                                     ! CTI   Group brk forced
-        mov            %i5, %o5                                ! IEU0
-3:     stx             %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
-ret_sys_call:
-#ifdef SYSCALL_TRACING
-       call            syscall_trace_exit
-        add            %sp, STACK_BIAS + REGWIN_SZ, %o1
-#endif
-       ldx             [%curptr + AOFF_task_flags], %l6
-       sra             %o0, 0, %o0
-       mov             %ulo(TSTATE_XCARRY | TSTATE_ICARRY), %g2
-       ldx             [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE], %g3
-       cmp             %o0, -ENOIOCTLCMD
-       sllx            %g2, 32, %g2
-       bgeu,pn         %xcc, 1f
-        andcc          %l6, 0x20, %l6  
-
-       /* System call success, clear Carry condition code. */
-       andn            %g3, %g2, %g3
-       stx             %g3, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE]      
-       bne,pn          %icc, linux_syscall_trace2
-        ldx            [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC], %l1 ! pc = npc
-       add             %l1, 0x4, %l2                                    !npc = npc+4
-       stx             %l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC]
-       b,pt            %xcc, rtrap_clr_l6
-        stx            %l2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC]
-1:
-       /* System call failure, set Carry condition code.
-        * Also, get abs(errno) to return to the process.
-        */
-       sub             %g0, %o0, %o0
-       or              %g3, %g2, %g3
-       stx             %o0, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_I0]
-       mov             1, %l6
-       stx             %g3, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TSTATE]
-       bne,pn          %icc, linux_syscall_trace2
-        ldx            [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC], %l1 ! pc = npc
-       add             %l1, 0x4, %l2                                    !npc = npc+4
-
-       stx             %l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC]
-       b,pt            %xcc, rtrap
-        stx            %l2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC]
-linux_syscall_trace2:
-       call            syscall_trace
-        add            %l1, 0x4, %l2                   /* npc = npc+4 */
-       stx             %l1, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TPC]
-       ba,pt           %xcc, rtrap
-        stx            %l2, [%sp + STACK_BIAS + REGWIN_SZ + PT_V9_TNPC]
-
-       .align          32
-       .globl          __flushw_user
-__flushw_user:
-1:     save            %sp, -128, %sp
-       rdpr            %otherwin, %g1
-       brnz,pt         %g1, 1b
-        add            %g2, 1, %g2
-1:     sub             %g2, 1, %g2
-       brnz,pt         %g2, 1b
-        restore        %g0, %g0, %g0
-2:     retl
-        mov            %g3, %o7

diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index bcf05190158c3f836f69d934326bf29592f65294..373d122c3ddbe5adc59e3351293073c1f3707098 100644 (file)
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -72,11 +72,7 @@ asmlinkage int cpu_idle(void)
        current->priority = 0;
        while(1) {
                check_pgt_cache();
-               if(tq_scheduler) {
-                       lock_kernel();
-                       run_task_queue(&tq_scheduler);
-                       unlock_kernel();
-               }
+               run_task_queue(&tq_scheduler);
                barrier();
                current->counter = 0;
                if(current->need_resched)

diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 05b643da2a519b84ca85117794608303111c2cb5..3ec32e92bee833277e3486aa12f615a4865acb4e 100644 (file)
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -3,7 +3,6 @@
  * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/tasks.h>

diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 083339e7cf1d8fa0954d2be210ec887bf639aca4..7239923ec47aa10e2a834bb2d0db3ca0e05bd32c 100644 (file)
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -46,6 +46,8 @@
 #include <linux/ioport.h>
 #include <linux/config.h>
 #include <linux/init.h>
+#include <linux/smp_lock.h>
+
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -2001,7 +2003,6 @@ static void stl_echpci64intr(stlbrd_t *brdp)
 /*
  *     Service an off-level request for some channel.
  */
-
 static void stl_offintr(void *private)
 {
        stlport_t               *portp;
@@ -2016,10 +2017,12 @@ static void stl_offintr(void *private)
 
        if (portp == (stlport_t *) NULL)
                return;
+
        tty = portp->tty;
        if (tty == (struct tty_struct *) NULL)
                return;
 
+       lock_kernel();
        if (test_bit(ASYI_TXLOW, &portp->istate)) {
                if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
                    tty->ldisc.write_wakeup)
@@ -2041,6 +2044,7 @@ static void stl_offintr(void *private)
                        }
                }
        }
+       unlock_kernel();
 }
 
 /*****************************************************************************/

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 531335c0d1a182ce3acf31cedcd0fb3fb41cc3f9..868f8abece4eebbabf07f5415808b2d48b18034a 100644 (file)
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -80,6 +80,7 @@
 #include <linux/proc_fs.h>
 #endif
 #include <linux/init.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -371,17 +372,24 @@ static struct file_operations hung_up_tty_fops = {
        NULL            /* hung_up_tty_fasync */
 };
 
+/*
+ * This can be called through the "tq_scheduler" 
+ * task-list. That is process synchronous, but
+ * doesn't hold any locks, so we need to make
+ * sure we have the appropriate locks for what
+ * we're doing..
+ */
 void do_tty_hangup(void *data)
 {
        struct tty_struct *tty = (struct tty_struct *) data;
        struct file * filp;
        struct task_struct *p;
-       unsigned long   flags;
 
        if (!tty)
                return;
-       
-       save_flags(flags); cli();
+
+       /* inuse_filps is protected by the single kernel lock */
+       lock_kernel();
        
        check_tty_count(tty, "do_tty_hangup");
        for (filp = inuse_filps; filp; filp = filp->f_next) {
@@ -400,13 +408,21 @@ void do_tty_hangup(void *data)
                filp->f_op = &hung_up_tty_fops;
        }
        
-       if (tty->ldisc.flush_buffer)
-               tty->ldisc.flush_buffer(tty);
-       if (tty->driver.flush_buffer)
-               tty->driver.flush_buffer(tty);
-       if ((test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags)) &&
-           tty->ldisc.write_wakeup)
-               (tty->ldisc.write_wakeup)(tty);
+       /* FIXME! What are the locking issues here? This may me overdoing things.. */
+       {
+               unsigned long flags;
+
+               save_flags(flags); cli();
+               if (tty->ldisc.flush_buffer)
+                       tty->ldisc.flush_buffer(tty);
+               if (tty->driver.flush_buffer)
+                       tty->driver.flush_buffer(tty);
+               if ((test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags)) &&
+                   tty->ldisc.write_wakeup)
+                       (tty->ldisc.write_wakeup)(tty);
+               restore_flags(flags);
+       }
+
        wake_up_interruptible(&tty->write_wait);
        wake_up_interruptible(&tty->read_wait);
 
@@ -449,7 +465,7 @@ void do_tty_hangup(void *data)
        tty->ctrl_status = 0;
        if (tty->driver.hangup)
                (tty->driver.hangup)(tty);
-       restore_flags(flags);
+       unlock_kernel();
 }
 
 void tty_hangup(struct tty_struct * tty)
@@ -459,7 +475,7 @@ void tty_hangup(struct tty_struct * tty)
        
        printk("%s hangup...\n", tty_name(tty, buf));
 #endif
-       queue_task(&tty->tq_hangup, &tq_timer);
+       queue_task(&tty->tq_hangup, &tq_scheduler);
 }
 
 void tty_vhangup(struct tty_struct * tty)
@@ -1158,6 +1174,7 @@ static void release_dev(struct file * filp)
         * Make sure that the tty's task queue isn't activated. 
         */
        run_task_queue(&tq_timer);
+       run_task_queue(&tq_scheduler);
 
        /* 
         * The release_mem function takes care of the details of clearing

diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index b0f31f4c0f752c16ccc58ca7ec8810f203d3b029..ee6b014bde9d2c019d18aaac62cacd363ef29c27 100644 (file)
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -11,6 +11,7 @@
  * Copyright (C) 1998 Paul Mackerras and Fabio Riccardi.
  */
 #include <stdarg.h>
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>

diff --git a/include/asm-sparc/mostek.h b/include/asm-sparc/mostek.h
index 5fb104d664f64727ab9c1ca9c527214842215d48..4078693481d3fd12be769ecea1ba70c4c47f823f 100644 (file)
--- a/include/asm-sparc/mostek.h
+++ b/include/asm-sparc/mostek.h
@@ -9,6 +9,7 @@
 #ifndef _SPARC_MOSTEK_H
 #define _SPARC_MOSTEK_H
 
+#include <linux/config.h>
 #include <asm/idprom.h>
 
 /*       M48T02 Register Map (adapted from Sun NVRAM/Hostid FAQ)

diff --git a/kernel/sched.c b/kernel/sched.c
index 2336a678671a2ac0487c95829531b8cd33e6570e..1b76fee500c8ace5c36332c867dd4f27660e1912 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -469,8 +469,11 @@ asmlinkage void schedule(void)
        if (in_interrupt())
                goto scheduling_in_interrupt;
        release_kernel_lock(prev, this_cpu);
+
+       /* Do "administrative" work here while we don't hold any locks */
        if (bh_active & bh_mask)
                do_bottom_half();
+       run_task_queue(&tq_scheduler);
 
        spin_lock(&scheduler_lock);
        spin_lock_irq(&runqueue_lock);