patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / h8300 / kernel / process.c

diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c
index afe7417..d7c058d 100644 (file)
--- a/arch/h8300/kernel/process.c
+++ b/arch/h8300/kernel/process.c
@@ -55,9 +55,9 @@ void default_idle(void)
 {
        while(1) {
                if (need_resched()) {
-                       sti();
+                       local_irq_enable();
                        __asm__("sleep");
-                       cli();
+                       local_irq_disable();
                }
                schedule();
        }
@@ -112,14 +112,13 @@ EXPORT_SYMBOL(machine_power_off);
 
 void show_regs(struct pt_regs * regs)
 {
-       printk("\n");
-       printk("PC: %08lx  Status: %02x\n",
+       printk("\nPC: %08lx  Status: %02x",
               regs->pc, regs->ccr);
-       printk("ORIG_ER0: %08lx ER0: %08lx ER1: %08lx\n",
+       printk("\nORIG_ER0: %08lx ER0: %08lx ER1: %08lx",
               regs->orig_er0, regs->er0, regs->er1);
-       printk("ER2: %08lx ER3: %08lx ER4: %08lx ER5: %08lx\n",
+       printk("\nER2: %08lx ER3: %08lx ER4: %08lx ER5: %08lx",
               regs->er2, regs->er3, regs->er4, regs->er5);
-       printk("ER6' %08lx ",regs->er6);
+       printk("\nER6' %08lx ",regs->er6);
        if (user_mode(regs))
                printk("USP: %08lx\n", rdusp());
        else
@@ -261,12 +260,6 @@ out:
        return error;
 }
 
-/*
- * These bracket the sleeping functions..
- */
-#define first_sched    ((unsigned long) scheduling_functions_start_here)
-#define last_sched     ((unsigned long) scheduling_functions_end_here)
-
 unsigned long thread_saved_pc(struct task_struct *tsk)
 {
        return ((struct pt_regs *)tsk->thread.esp0)->pc;
@@ -287,7 +280,7 @@ unsigned long get_wchan(struct task_struct *p)
                    fp >= 8184+stack_page)
                        return 0;
                pc = ((unsigned long *)fp)[1];
-               if (pc < first_sched || pc >= last_sched)
+               if (!in_sched_functions(pc))
                        return pc;
                fp = *(unsigned long *) fp;
        } while (count++ < 16);