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

Commit 11494547 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: fix apic version warning 



after following patch,

commit 1b313f4a
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Mon Aug 18 20:45:57 2008 +0400

    x86: apic - generic_processor_info

    - use physid_set instead of phys_cpu and physids_or
    - set phys_cpu_present_map bit AFTER check for allowed
      number of processors
    - add checking for APIC valid version in 64bit mode
      (mostly not needed but added for merging purpose)
    - add apic_version definition for 64bit mode which
      is used now

we are getting warning for acpi path on 64 bit system.

make the 64-bit side fill in apic_version[] as well.

[ mingo@elte.hu: build fix ]

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1b4ee4e4

arch/x86/kernel/acpi/boot.c

+0 −4
Original line number Diff line number Diff line
@@ -239,10 +239,8 @@ static void __cpuinit acpi_register_lapic(int id, u8 enabled) 
		return;

	}



#ifdef CONFIG_X86_32

	if (boot_cpu_physical_apicid != -1U)

		ver = apic_version[boot_cpu_physical_apicid];

#endif



	generic_processor_info(id, ver);

}
@@ -762,10 +760,8 @@ static void __init acpi_register_lapic_address(unsigned long address) 
	set_fixmap_nocache(FIX_APIC_BASE, address);

	if (boot_cpu_physical_apicid == -1U) {

		boot_cpu_physical_apicid  = read_apic_id();

#ifdef CONFIG_X86_32

		apic_version[boot_cpu_physical_apicid] =

			 GET_APIC_VERSION(apic_read(APIC_LVR));

#endif

	}

}

include/asm-x86/mpspec.h

+2 −1
Original line number Diff line number Diff line
@@ -5,11 +5,12 @@ 


#include <asm/mpspec_def.h>



extern int apic_version[MAX_APICS];



#ifdef CONFIG_X86_32

#include <mach_mpspec.h>



extern unsigned int def_to_bigsmp;

extern int apic_version[MAX_APICS];

extern u8 apicid_2_node[];

extern int pic_mode;