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

Commit 36a028de authored Jul 24, 2008 by Cyrill Gorcunov Committed by Ingo Molnar Jul 24, 2008

x86: apic unification - merge down lapic_get_maxlvt



No code change on binary level.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: macro@linux-mips.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 32f71aff

arch/x86/kernel/apic_32.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -193,9 +193,13 @@ int get_physical_broadcast(void)
		*/
		int lapic_get_maxlvt(void)
		{
		unsigned int v = apic_read(APIC_LVR);
		unsigned int v;

		/* 82489DXs do not report # of LVT entries. */
		v = apic_read(APIC_LVR);
		/*
		* - we always have APIC integrated on 64bit mode
		* - 82489DXs do not report # of LVT entries
		*/
		return APIC_INTEGRATED(GET_APIC_VERSION(v)) ? GET_APIC_MAXLVT(v) : 2;
		}

arch/x86/kernel/apic_64.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -158,11 +158,14 @@ void __cpuinit enable_NMI_through_LVT0(void)
		*/
		int lapic_get_maxlvt(void)
		{
		unsigned int v, maxlvt;
		unsigned int v;

		v = apic_read(APIC_LVR);
		maxlvt = GET_APIC_MAXLVT(v);
		return maxlvt;
		/*
		* - we always have APIC integrated on 64bit mode
		* - 82489DXs do not report # of LVT entries
		*/
		return APIC_INTEGRATED(GET_APIC_VERSION(v)) ? GET_APIC_MAXLVT(v) : 2;
		}

		/*