CRISv32: annotate irq enable in idle loop

[linux-2.6-microblaze.git] / arch / cris / arch-v32 / kernel / process.c

diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c
index 2b23ef0..c7ce784 100644 (file)
--- a/arch/cris/arch-v32/kernel/process.c
+++ b/arch/cris/arch-v32/kernel/process.c
@@ -20,18 +20,12 @@
 
 extern void stop_watchdog(void);
 
-extern int cris_hlt_counter;
-
 /* We use this if we don't have any better idle routine. */
 void default_idle(void)
 {
-       local_irq_disable();
-       if (!need_resched() && !cris_hlt_counter) {
-               /* Halt until exception. */
-               __asm__ volatile("ei    \n\t"
-                                 "halt      ");
-       }
        local_irq_enable();
+       /* Halt until exception. */
+       __asm__ volatile("halt");
 }
 
 /*
@@ -170,6 +164,9 @@ get_wchan(struct task_struct *p)
 void show_regs(struct pt_regs * regs)
 {
        unsigned long usp = rdusp();
+
+       show_regs_print_info(KERN_DEFAULT);
+
         printk("ERP: %08lx SRP: %08lx  CCS: %08lx USP: %08lx MOF: %08lx\n",
                regs->erp, regs->srp, regs->ccs, usp, regs->mof);