Skip to content

L
linux
Commit 7475d10b authored by David S. Miller's avatar David S. Miller
Browse files
Options

SPARC64: Remove some cli/sti usage.

parent 41fc2c33
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 76 deletions
arch/sparc64/kernel/irq.c
View file @ 7475d10b
This diff is collapsed.
arch/sparc64/kernel/process.c
View file @ 7475d10b
...@@ -129,9 +129,6 @@ extern void (*prom_keyboard)(void); ...@@ -129,9 +129,6 @@ extern void (*prom_keyboard)(void);
void machine_halt(void) void machine_halt(void)
{ {
sti();
mdelay(8);
cli();
#ifdef CONFIG_SUN_CONSOLE #ifdef CONFIG_SUN_CONSOLE
if (!serial_console && prom_palette) if (!serial_console && prom_palette)
prom_palette (1); prom_palette (1);
...@@ -144,9 +141,6 @@ void machine_halt(void) ...@@ -144,9 +141,6 @@ void machine_halt(void)
void machine_alt_power_off(void) void machine_alt_power_off(void)
{ {
sti();
mdelay(8);
cli();
#ifdef CONFIG_SUN_CONSOLE #ifdef CONFIG_SUN_CONSOLE
if (!serial_console && prom_palette) if (!serial_console && prom_palette)
prom_palette(1); prom_palette(1);
...@@ -161,10 +155,6 @@ void machine_restart(char * cmd) ...@@ -161,10 +155,6 @@ void machine_restart(char * cmd)
{ {
char *p; char *p;
sti();
mdelay(8);
cli();
p = strchr (reboot_command, '\n'); p = strchr (reboot_command, '\n');
if (p) *p = 0; if (p) *p = 0;
#ifdef CONFIG_SUN_CONSOLE #ifdef CONFIG_SUN_CONSOLE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7