leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ACPI] revert bad processor_core.c patch for bug 5128

Browse Source 
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown 2005-09-03 12:40:06 -04:00
parent 2413d2c12c
commit 4a35a46bf1
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/acpi/processor_core.c
View File

@ -400,7 +400,7 @@ static int acpi_processor_remove_fs(struct acpi_device *device)
/* Use the acpiid in MADT to map cpus in case of SMP */ /* Use the acpiid in MADT to map cpus in case of SMP */
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
#define convert_acpiid_to_cpu(acpi_id, cpu_indexp) (0xff) #define convert_acpiid_to_cpu(acpi_id) (0xff)
#else #else
#ifdef CONFIG_IA64 #ifdef CONFIG_IA64
@ -413,20 +413,18 @@ static int acpi_processor_remove_fs(struct acpi_device *device)
#define ARCH_BAD_APICID (0xff) #define ARCH_BAD_APICID (0xff)
#endif #endif
static int convert_acpiid_to_cpu(u8 acpi_id, unsigned int *cpu_index) static u8 convert_acpiid_to_cpu(u8 acpi_id)
{ {
u16 apic_id; u16 apic_id;
unsigned int i; int i;
apic_id = arch_acpiid_to_apicid[acpi_id]; apic_id = arch_acpiid_to_apicid[acpi_id];
if (apic_id == ARCH_BAD_APICID) if (apic_id == ARCH_BAD_APICID)
return -1; return -1;
for (i = 0; i < NR_CPUS; i++) { for (i = 0; i < NR_CPUS; i++) {
if (arch_cpu_to_apicid[i] == apic_id) { if (arch_cpu_to_apicid[i] == apic_id)
*cpu_index = i; return i;
return 0;
}
} }
return -1; return -1;
} }
@ -441,8 +439,7 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
acpi_status status = 0; acpi_status status = 0;
union acpi_object object = { 0 }; union acpi_object object = { 0 };
struct acpi_buffer buffer = { sizeof(union acpi_object), &object }; struct acpi_buffer buffer = { sizeof(union acpi_object), &object };
unsigned int cpu_index; u8 cpu_index;
int retval;
static int cpu0_initialized; static int cpu0_initialized;
ACPI_FUNCTION_TRACE("acpi_processor_get_info"); ACPI_FUNCTION_TRACE("acpi_processor_get_info");
@ -485,10 +482,10 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
*/ */
pr->acpi_id = object.processor.proc_id; pr->acpi_id = object.processor.proc_id;
retval = convert_acpiid_to_cpu(pr->acpi_id, &cpu_index); cpu_index = convert_acpiid_to_cpu(pr->acpi_id);
/* Handle UP system running SMP kernel, with no LAPIC in MADT */ /* Handle UP system running SMP kernel, with no LAPIC in MADT */
if (!cpu0_initialized && retval && if (!cpu0_initialized && (cpu_index == 0xff) &&
(num_online_cpus() == 1)) { (num_online_cpus() == 1)) {
cpu_index = 0; cpu_index = 0;
} }
@ -502,10 +499,10 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
* less than the max # of CPUs. They should be ignored _iff * less than the max # of CPUs. They should be ignored _iff
* they are physically not present. * they are physically not present.
*/ */
if (retval) { if (cpu_index >= NR_CPUS) {
if (ACPI_FAILURE if (ACPI_FAILURE
(acpi_processor_hotadd_init(pr->handle, &pr->id))) { (acpi_processor_hotadd_init(pr->handle, &pr->id))) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO, ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
"Error getting cpuindex for acpiid 0x%x\n", "Error getting cpuindex for acpiid 0x%x\n",
pr->acpi_id)); pr->acpi_id));
return_VALUE(-ENODEV); return_VALUE(-ENODEV);