From 14ae6296b575f1f1322a79df3db5325ebe994679 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@nuts.ninka.net>
Date: Tue, 23 Jul 2002 11:24:10 -0700
Subject: [PATCH] SPARC64: Kill more cli/sti and local_irq_count/irqs_running
references.
---
arch/sparc64/kernel/process.c | 4 ----
arch/sparc64/kernel/setup.c | 6 +++---
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index c65bf370b565..b1f9f772a234 100644
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -289,10 +289,6 @@ void __show_regs(struct pt_regs * regs)
: "=r" (flags)
: "i" (PSTATE_IE));
spin_lock(®dump_lock);
- printk("CPU[%d]: local_irq_count[%u] irqs_running[%d]\n",
- smp_processor_id(),
- local_irq_count(smp_processor_id()),
- irqs_running());
#endif
printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
regs->tpc, regs->tnpc, regs->y, print_tainted());
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 6eb3c959b1cb..6dcd1d37d2eb 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -127,10 +127,10 @@ int prom_callback(long *args)
if (!strcmp(cmd, "sync")) {
prom_printf("PROM `%s' command...\n", cmd);
show_free_areas();
- if(current->pid != 0) {
- sti();
+ if (current->pid != 0) {
+ local_irq_enable();
sys_sync();
- cli();
+ local_irq_disable();
}
args[2] = 0;
args[args[1] + 3] = -1;
--
2.30.9