forked from Minki/linux
ACPI: build fix for u8 cpu_index
Local apic entries are only 8 bits, but it seemed to not be caught with u8 return value result in the check cpu_index >= NR_CPUS becomming always false. drivers/acpi/processor_core.c: In function `acpi_processor_get_info': drivers/acpi/processor_core.c:483: warning: comparison is always false due to limited range of data type Signed-off-by: Ashok Raj <ashok.raj@intel.com> Cc: Dave Jones <davej@codemonkey.org.uk> Cc: Kenji Kaneshige <kaneshige.kenji@soft.fujitsu.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
200739c179
commit
df42baa0d8
@ -388,7 +388,7 @@ static int acpi_processor_remove_fs(struct acpi_device *device)
|
||||
|
||||
/* Use the acpiid in MADT to map cpus in case of SMP */
|
||||
#ifndef CONFIG_SMP
|
||||
#define convert_acpiid_to_cpu(acpi_id) (0xff)
|
||||
#define convert_acpiid_to_cpu(acpi_id) (-1)
|
||||
#else
|
||||
|
||||
#ifdef CONFIG_IA64
|
||||
@ -401,7 +401,7 @@ static int acpi_processor_remove_fs(struct acpi_device *device)
|
||||
#define ARCH_BAD_APICID (0xff)
|
||||
#endif
|
||||
|
||||
static u8 convert_acpiid_to_cpu(u8 acpi_id)
|
||||
static int convert_acpiid_to_cpu(u8 acpi_id)
|
||||
{
|
||||
u16 apic_id;
|
||||
int i;
|
||||
@ -427,7 +427,7 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
|
||||
acpi_status status = 0;
|
||||
union acpi_object object = { 0 };
|
||||
struct acpi_buffer buffer = { sizeof(union acpi_object), &object };
|
||||
u8 cpu_index;
|
||||
int cpu_index;
|
||||
static int cpu0_initialized;
|
||||
|
||||
ACPI_FUNCTION_TRACE("acpi_processor_get_info");
|
||||
@ -473,7 +473,7 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
|
||||
cpu_index = convert_acpiid_to_cpu(pr->acpi_id);
|
||||
|
||||
/* Handle UP system running SMP kernel, with no LAPIC in MADT */
|
||||
if (!cpu0_initialized && (cpu_index == 0xff) &&
|
||||
if (!cpu0_initialized && (cpu_index == -1) &&
|
||||
(num_online_cpus() == 1)) {
|
||||
cpu_index = 0;
|
||||
}
|
||||
@ -487,7 +487,7 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
|
||||
* less than the max # of CPUs. They should be ignored _iff
|
||||
* they are physically not present.
|
||||
*/
|
||||
if (cpu_index >= NR_CPUS) {
|
||||
if (cpu_index == -1) {
|
||||
if (ACPI_FAILURE
|
||||
(acpi_processor_hotadd_init(pr->handle, &pr->id))) {
|
||||
ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
|
||||
|
Loading…
Reference in New Issue
Block a user