aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86_64/kernel/apic.c3
-rw-r--r--arch/x86_64/kernel/genapic_flat.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
index 660602c51f51..b95d1e378b96 100644
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
@@ -468,8 +468,7 @@ static int lapic_suspend(struct sys_device *dev, pm_message_t state)
468 apic_pm_state.apic_tmict = apic_read(APIC_TMICT); 468 apic_pm_state.apic_tmict = apic_read(APIC_TMICT);
469 apic_pm_state.apic_tdcr = apic_read(APIC_TDCR); 469 apic_pm_state.apic_tdcr = apic_read(APIC_TDCR);
470 apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR); 470 apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);
471 local_save_flags(flags); 471 local_irq_save(flags);
472 local_irq_disable();
473 disable_local_APIC(); 472 disable_local_APIC();
474 local_irq_restore(flags); 473 local_irq_restore(flags);
475 return 0; 474 return 0;
diff --git a/arch/x86_64/kernel/genapic_flat.c b/arch/x86_64/kernel/genapic_flat.c
index 2ceb8b872b57..50ad153eaac4 100644
--- a/arch/x86_64/kernel/genapic_flat.c
+++ b/arch/x86_64/kernel/genapic_flat.c
@@ -49,8 +49,7 @@ static void flat_send_IPI_mask(cpumask_t cpumask, int vector)
49 unsigned long cfg; 49 unsigned long cfg;
50 unsigned long flags; 50 unsigned long flags;
51 51
52 local_save_flags(flags); 52 local_irq_save(flags);
53 local_irq_disable();
54 53
55 /* 54 /*
56 * Wait for idle. 55 * Wait for idle.