aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorHisashi Hifumi <hifumi.hisashi@oss.ntt.co.jp>2007-05-02 13:27:18 -0400
committerAndi Kleen <andi@basil.nowhere.org>2007-05-02 13:27:18 -0400
commit62dbc210e2532dec061ca65eeb8bc31b6c898b01 (patch)
treeba17be411deecbf6e114b65336463527311370c8 /arch/i386
parente8a72ffa3aa618fb25b5727c0e0ae939d30d66c0 (diff)
[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>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/reboot.c6
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 [] =
198 */ 198 */
199void machine_real_restart(unsigned char *code, int length) 199void machine_real_restart(unsigned char *code, int length)
200{ 200{
201 unsigned long flags;
202
203 local_irq_disable(); 201 local_irq_disable();
204 202
205 /* Write zero to CMOS register number 0x0f, which the BIOS POST 203 /* Write zero to CMOS register number 0x0f, which the BIOS POST
@@ -212,9 +210,9 @@ void machine_real_restart(unsigned char *code, int length)
212 safe side. (Yes, CMOS_WRITE does outb_p's. - Paul G.) 210 safe side. (Yes, CMOS_WRITE does outb_p's. - Paul G.)
213 */ 211 */
214 212
215 spin_lock_irqsave(&rtc_lock, flags); 213 spin_lock(&rtc_lock);
216 CMOS_WRITE(0x00, 0x8f); 214 CMOS_WRITE(0x00, 0x8f);
217 spin_unlock_irqrestore(&rtc_lock, flags); 215 spin_unlock(&rtc_lock);
218 216
219 /* Remap the kernel at virtual address zero, as well as offset zero 217 /* Remap the kernel at virtual address zero, as well as offset zero
220 from the kernel segment. This assumes the kernel segment starts at 218 from the kernel segment. This assumes the kernel segment starts at