Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 85865
b: refs/heads/master
c: 101788b
h: refs/heads/master
i:
  85863: c010005
v: v3
  • Loading branch information
David S. Miller committed Feb 18, 2008
1 parent e1c9782 commit b58b478
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1d5509aa6985b256a426e67ae6952fd4b7664de7
refs/heads/master: 101788b0ab5464cf485c5d434ac30563e6f9e5fe
7 changes: 0 additions & 7 deletions trunk/arch/sparc64/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,12 @@ void cpu_idle(void)
extern char reboot_command [];

extern void (*prom_palette)(int);
extern void (*prom_keyboard)(void);

void machine_halt(void)
{
sstate_halt();
if (prom_palette)
prom_palette (1);
if (prom_keyboard)
prom_keyboard();
prom_halt();
panic("Halt failed!");
}
Expand All @@ -132,8 +129,6 @@ void machine_alt_power_off(void)
sstate_poweroff();
if (prom_palette)
prom_palette(1);
if (prom_keyboard)
prom_keyboard();
prom_halt_power_off();
panic("Power-off failed!");
}
Expand All @@ -147,8 +142,6 @@ void machine_restart(char * cmd)
if (p) *p = 0;
if (prom_palette)
prom_palette (1);
if (prom_keyboard)
prom_keyboard();
if (cmd)
prom_reboot(cmd);
if (*reboot_command)
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/sparc64/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ struct screen_info screen_info = {
};

void (*prom_palette)(int);
void (*prom_keyboard)(void);

static void
prom_console_write(struct console *con, const char *s, unsigned n)
Expand Down

0 comments on commit b58b478

Please sign in to comment.