← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/acpi/numa.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/acpi/numa.c
274
274
 
275
275
int __init acpi_numa_init(void)
276
276
{
277
 
        int ret = 0;
 
277
        int cnt = 0;
278
278
 
279
279
        /*
280
280
         * Should not limit number with cpu num that is from NR_CPUS or nr_cpus=
288
288
                                     acpi_parse_x2apic_affinity, 0);
289
289
                acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,
290
290
                                     acpi_parse_processor_affinity, 0);
291
 
                ret = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
 
291
                cnt = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
292
292
                                            acpi_parse_memory_affinity,
293
293
                                            NR_NODE_MEMBLKS);
294
294
        }
297
297
        acpi_table_parse(ACPI_SIG_SLIT, acpi_parse_slit);
298
298
 
299
299
        acpi_numa_arch_fixup();
300
 
        return ret;
 
300
 
 
301
        if (cnt <= 0)
 
302
                return cnt ?: -ENOENT;
 
303
        return 0;
301
304
}
302
305
 
303
306
int acpi_get_pxm(acpi_handle h)