Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24968cfd authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: apic - unify lapic_suspend 



Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 92206c90

arch/x86/kernel/apic_32.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1582,7 +1582,7 @@ static int lapic_suspend(struct sys_device *dev, pm_message_t state) 
	apic_pm_state.apic_lvterr = apic_read(APIC_LVTERR);

	apic_pm_state.apic_lvterr = apic_read(APIC_LVTERR);

	apic_pm_state.apic_tmict = apic_read(APIC_TMICT);

	apic_pm_state.apic_tmict = apic_read(APIC_TMICT);

	apic_pm_state.apic_tdcr = apic_read(APIC_TDCR);

	apic_pm_state.apic_tdcr = apic_read(APIC_TDCR);

#ifdef CONFIG_X86_MCE_P4THERMAL

#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL)

	if (maxlvt >= 5)

	if (maxlvt >= 5)

		apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);

		apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);

#endif

#endif

arch/x86/kernel/apic_64.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1390,10 +1390,11 @@ static int lapic_suspend(struct sys_device *dev, pm_message_t state) 
	apic_pm_state.apic_lvterr = apic_read(APIC_LVTERR);

	apic_pm_state.apic_lvterr = apic_read(APIC_LVTERR);

	apic_pm_state.apic_tmict = apic_read(APIC_TMICT);

	apic_pm_state.apic_tmict = apic_read(APIC_TMICT);

	apic_pm_state.apic_tdcr = apic_read(APIC_TDCR);

	apic_pm_state.apic_tdcr = apic_read(APIC_TDCR);

#ifdef CONFIG_X86_MCE_INTEL

#if defined(CONFIG_X86_MCE_P4THERMAL) || defined(CONFIG_X86_MCE_INTEL)

	if (maxlvt >= 5)

	if (maxlvt >= 5)

		apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);

		apic_pm_state.apic_thmr = apic_read(APIC_LVTTHMR);

#endif

#endif



	local_irq_save(flags);

	local_irq_save(flags);

	disable_local_APIC();

	disable_local_APIC();

	local_irq_restore(flags);

	local_irq_restore(flags);