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

Commit 2e9d5e4e authored by Alex Chiang's avatar Alex Chiang Committed by Len Brown
Browse files

ACPI: processor: export acpi_get_cpuid() 



Rename static get_cpu_id() to acpi_get_cpuid() and export it.

This change also gives us an opportunity to remove the
#ifndef CONFIG_SMP from processor_driver.c and into a header file
where it properly belongs.

Acked-by: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: default avatarAlex Chiang <achiang@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 4d5d4cd8

drivers/acpi/processor_driver.c

+4 −6
Original line number Diff line number Diff line
@@ -361,10 +361,7 @@ static inline int acpi_processor_remove_fs(struct acpi_device *device) 


/* Use the acpiid in MADT to map cpus in case of SMP */



#ifndef CONFIG_SMP

static int get_cpu_id(acpi_handle handle, int type, u32 acpi_id) { return -1; }

#else



#ifdef CONFIG_SMP

static struct acpi_table_madt *madt;



static int map_lapic_id(struct acpi_subtable_header *entry,
@@ -496,7 +493,7 @@ static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id) 
	return apic_id;

}



static int get_cpu_id(acpi_handle handle, int type, u32 acpi_id)

int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)

{

	int i;

	int apic_id = -1;
@@ -513,6 +510,7 @@ static int get_cpu_id(acpi_handle handle, int type, u32 acpi_id) 
	}

	return -1;

}

EXPORT_SYMBOL_GPL(acpi_get_cpuid);

#endif



/* --------------------------------------------------------------------------
@@ -579,7 +577,7 @@ static int acpi_processor_get_info(struct acpi_device *device) 
		device_declaration = 1;

		pr->acpi_id = value;

	}

	cpu_index = get_cpu_id(pr->handle, device_declaration, pr->acpi_id);

	cpu_index = acpi_get_cpuid(pr->handle, device_declaration, pr->acpi_id);



	/* Handle UP system running SMP kernel, with no LAPIC in MADT */

	if (!cpu0_initialized && (cpu_index == -1) &&

include/acpi/processor.h

+8 −0
Original line number Diff line number Diff line
@@ -322,6 +322,14 @@ static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit) 


/* in processor_core.c */

void acpi_processor_set_pdc(acpi_handle handle);

#ifdef CONFIG_SMP

int acpi_get_cpuid(acpi_handle, int type, u32 acpi_id);

#else

static inline int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)

{

	return -1;

}

#endif



/* in processor_throttling.c */

int acpi_processor_tstate_has_changed(struct acpi_processor *pr);