lkml.org 
[lkml]   [2011]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [GIT PULL] x86/apic changes for v2.6.38
On 01/12/2011 12:28 AM, Ingo Molnar wrote:
>
> * Tony Luck <tony.luck@intel.com> wrote:
>
>> On Thu, Jan 6, 2011 at 4:17 PM, Yinghai Lu <yinghai@kernel.org> wrote:
>>> Assume Tony will have another patch for IA64 to check that before
>>> apply this patch.
>>
>> Ingo,
>>
>> Ok, I sent (a slightly modified version of) this patch up to Linus
>> as part of the ia64 merge window pull ... so it is safe to update
>> drivers/acpi/numa.c with a patch that will parse all the SRAT cpu
>> entries down to ia64 now.
>
> Thanks Tony!
>
> Since the original commit d3bd058 is already upstream i suspect we should be fine
> all around, right?

he mean this one:

Untested on X86. Builds and boots on ia64 (both normally and with
maxcpus=8 to limit the number of cpus).

Signed-off-by: Tony Luck <tony.luck@intel.com>

---
I left the comment ... though it might need some tweaking as it is
kind of tenuously connected to the '0' argument passed to acpi_table_parse_srat.

diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index d9926af..5eb25eb 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -275,23 +275,19 @@ acpi_table_parse_srat(enum acpi_srat_type id,
int __init acpi_numa_init(void)
{
int ret = 0;
- int nr_cpu_entries = nr_cpu_ids;

-#ifdef CONFIG_X86
/*
* Should not limit number with cpu num that is from NR_CPUS or nr_cpus=
* SRAT cpu entries could have different order with that in MADT.
* So go over all cpu entries in SRAT to get apicid to node mapping.
*/
- nr_cpu_entries = MAX_LOCAL_APIC;
-#endif

/* SRAT: Static Resource Affinity Table */
if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) {
acpi_table_parse_srat(ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY,
- acpi_parse_x2apic_affinity, nr_cpu_entries);
+ acpi_parse_x2apic_affinity, 0);
acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,
- acpi_parse_processor_affinity, nr_cpu_entries);
+ acpi_parse_processor_affinity, 0);
ret = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
acpi_parse_memory_affinity,
NR_NODE_MEMBLKS);


\
 
 \ /
  Last update: 2011-01-12 09:55    [from the cache]
©2003-2011 Jasper Spaans