Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 53907
b: refs/heads/master
c: 62dbc21
h: refs/heads/master
i:
  53905: 43f770a
  53903: 1ec9c50
v: v3
  • Loading branch information
Hisashi Hifumi authored and Andi Kleen committed May 2, 2007
1 parent 4d8fb41 commit dfd77f0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: e8a72ffa3aa618fb25b5727c0e0ae939d30d66c0
refs/heads/master: 62dbc210e2532dec061ca65eeb8bc31b6c898b01
6 changes: 2 additions & 4 deletions trunk/arch/i386/kernel/reboot.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,6 @@ static unsigned char jump_to_bios [] =
*/
void machine_real_restart(unsigned char *code, int length)
{
unsigned long flags;

local_irq_disable();

/* Write zero to CMOS register number 0x0f, which the BIOS POST
Expand All @@ -212,9 +210,9 @@ void machine_real_restart(unsigned char *code, int length)
safe side. (Yes, CMOS_WRITE does outb_p's. - Paul G.)
*/

spin_lock_irqsave(&rtc_lock, flags);
spin_lock(&rtc_lock);
CMOS_WRITE(0x00, 0x8f);
spin_unlock_irqrestore(&rtc_lock, flags);
spin_unlock(&rtc_lock);

/* Remap the kernel at virtual address zero, as well as offset zero
from the kernel segment. This assumes the kernel segment starts at
Expand Down

0 comments on commit dfd77f0

Please sign in to comment.