From dfd77f0ab01ef6796561ddb64b4e1e8fb142addc Mon Sep 17 00:00:00 2001 From: Hisashi Hifumi Date: Wed, 2 May 2007 19:27:18 +0200 Subject: [PATCH] --- yaml --- r: 53907 b: refs/heads/master c: 62dbc210e2532dec061ca65eeb8bc31b6c898b01 h: refs/heads/master i: 53905: 43f770af1685e5371f9d9f04da015a4eb0621807 53903: 1ec9c5083ce1ddcd8cb7cd790e3edd9a9b898eb7 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/reboot.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 97ebaf012ab1..d1e970d87987 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8a72ffa3aa618fb25b5727c0e0ae939d30d66c0 +refs/heads/master: 62dbc210e2532dec061ca65eeb8bc31b6c898b01 diff --git a/trunk/arch/i386/kernel/reboot.c b/trunk/arch/i386/kernel/reboot.c index 14b4de2882be..50dfc65319cd 100644 --- a/trunk/arch/i386/kernel/reboot.c +++ b/trunk/arch/i386/kernel/reboot.c @@ -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 @@ -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