diff options
author | Hisashi Hifumi <hifumi.hisashi@oss.ntt.co.jp> | 2007-05-02 19:27:18 +0200 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2007-05-02 19:27:18 +0200 |
commit | 62dbc210e2532dec061ca65eeb8bc31b6c898b01 (patch) | |
tree | ba17be411deecbf6e114b65336463527311370c8 | |
parent | e8a72ffa3aa618fb25b5727c0e0ae939d30d66c0 (diff) | |
download | blackbird-obmc-linux-62dbc210e2532dec061ca65eeb8bc31b6c898b01.tar.gz blackbird-obmc-linux-62dbc210e2532dec061ca65eeb8bc31b6c898b01.zip |
[PATCH] i386: replace spin_lock_irqsave with spin_lock
IRQ is already disabled through local_irq_disable(). So
spin_lock_irqsave() can be replaced with spin_lock().
Signed-off-by: Hisashi Hifumi <hifumi.hisashi@oss.ntt.co.jp>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r-- | arch/i386/kernel/reboot.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c index 14b4de2882be..50dfc65319cd 100644 --- a/arch/i386/kernel/reboot.c +++ b/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 |