Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / drivers / acpi / numa.c
index a82834b..64b98e8 100644 (file)
 
 #define ACPI_NUMA      0x80000000
 #define _COMPONENT     ACPI_NUMA
-       ACPI_MODULE_NAME ("numa")
+ACPI_MODULE_NAME("numa")
 
-extern int __init acpi_table_parse_madt_family (enum acpi_table_id id, unsigned long madt_size, int entry_id, acpi_madt_entry_handler handler, unsigned int max_entries);
+extern int __init acpi_table_parse_madt_family(enum acpi_table_id id,
+                                              unsigned long madt_size,
+                                              int entry_id,
+                                              acpi_madt_entry_handler handler,
+                                              unsigned int max_entries);
 
-void __init
-acpi_table_print_srat_entry (
-       acpi_table_entry_header *header)
+void __init acpi_table_print_srat_entry(acpi_table_entry_header * header)
 {
 
-       ACPI_FUNCTION_NAME ("acpi_table_print_srat_entry");
+       ACPI_FUNCTION_NAME("acpi_table_print_srat_entry");
 
        if (!header)
                return;
@@ -52,48 +54,55 @@ acpi_table_print_srat_entry (
 
        case ACPI_SRAT_PROCESSOR_AFFINITY:
 #ifdef ACPI_DEBUG_OUTPUT
-       {
-               struct acpi_table_processor_affinity *p =
-                       (struct acpi_table_processor_affinity*) header;
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO, "SRAT Processor (id[0x%02x] eid[0x%02x]) in proximity domain %d %s\n",
-                      p->apic_id, p->lsapic_eid, p->proximity_domain,
-                      p->flags.enabled?"enabled":"disabled"));
-       }
-#endif /* ACPI_DEBUG_OUTPUT */
+               {
+                       struct acpi_table_processor_affinity *p =
+                           (struct acpi_table_processor_affinity *)header;
+                       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                         "SRAT Processor (id[0x%02x] eid[0x%02x]) in proximity domain %d %s\n",
+                                         p->apic_id, p->lsapic_eid,
+                                         p->proximity_domain,
+                                         p->flags.
+                                         enabled ? "enabled" : "disabled"));
+               }
+#endif                         /* ACPI_DEBUG_OUTPUT */
                break;
 
        case ACPI_SRAT_MEMORY_AFFINITY:
 #ifdef ACPI_DEBUG_OUTPUT
-       {
-               struct acpi_table_memory_affinity *p =
-                       (struct acpi_table_memory_affinity*) header;
-               ACPI_DEBUG_PRINT((ACPI_DB_INFO, "SRAT Memory (0x%08x%08x length 0x%08x%08x type 0x%x) in proximity domain %d %s%s\n",
-                      p->base_addr_hi, p->base_addr_lo, p->length_hi, p->length_lo,
-                      p->memory_type, p->proximity_domain,
-                      p->flags.enabled ? "enabled" : "disabled",
-                      p->flags.hot_pluggable ? " hot-pluggable" : ""));
-       }
-#endif /* ACPI_DEBUG_OUTPUT */
+               {
+                       struct acpi_table_memory_affinity *p =
+                           (struct acpi_table_memory_affinity *)header;
+                       ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                                         "SRAT Memory (0x%08x%08x length 0x%08x%08x type 0x%x) in proximity domain %d %s%s\n",
+                                         p->base_addr_hi, p->base_addr_lo,
+                                         p->length_hi, p->length_lo,
+                                         p->memory_type, p->proximity_domain,
+                                         p->flags.
+                                         enabled ? "enabled" : "disabled",
+                                         p->flags.
+                                         hot_pluggable ? " hot-pluggable" :
+                                         ""));
+               }
+#endif                         /* ACPI_DEBUG_OUTPUT */
                break;
 
        default:
-               printk(KERN_WARNING PREFIX "Found unsupported SRAT entry (type = 0x%x)\n",
-                       header->type);
+               printk(KERN_WARNING PREFIX
+                      "Found unsupported SRAT entry (type = 0x%x)\n",
+                      header->type);
                break;
        }
 }
 
-
-static int __init
-acpi_parse_slit (unsigned long phys_addr, unsigned long size)
+static int __init acpi_parse_slit(unsigned long phys_addr, unsigned long size)
 {
-       struct acpi_table_slit  *slit;
-       u32                     localities;
+       struct acpi_table_slit *slit;
+       u32 localities;
 
        if (!phys_addr || !size)
                return -EINVAL;
 
-       slit = (struct acpi_table_slit *) __va(phys_addr);
+       slit = (struct acpi_table_slit *)__va(phys_addr);
 
        /* downcast just for %llu vs %lu for i386/ia64  */
        localities = (u32) slit->localities;
@@ -103,15 +112,13 @@ acpi_parse_slit (unsigned long phys_addr, unsigned long size)
        return 0;
 }
 
-
 static int __init
-acpi_parse_processor_affinity (
-       acpi_table_entry_header *header,
-       const unsigned long end)
+acpi_parse_processor_affinity(acpi_table_entry_header * header,
+                             const unsigned long end)
 {
        struct acpi_table_processor_affinity *processor_affinity;
 
-       processor_affinity = (struct acpi_table_processor_affinity*) header;
+       processor_affinity = (struct acpi_table_processor_affinity *)header;
        if (!processor_affinity)
                return -EINVAL;
 
@@ -123,15 +130,13 @@ acpi_parse_processor_affinity (
        return 0;
 }
 
-
 static int __init
-acpi_parse_memory_affinity (
-       acpi_table_entry_header *header,
-       const unsigned long end)
+acpi_parse_memory_affinity(acpi_table_entry_header * header,
+                          const unsigned long end)
 {
        struct acpi_table_memory_affinity *memory_affinity;
 
-       memory_affinity = (struct acpi_table_memory_affinity*) header;
+       memory_affinity = (struct acpi_table_memory_affinity *)header;
        if (!memory_affinity)
                return -EINVAL;
 
@@ -143,36 +148,30 @@ acpi_parse_memory_affinity (
        return 0;
 }
 
-
-static int __init
-acpi_parse_srat (unsigned long phys_addr, unsigned long size)
+static int __init acpi_parse_srat(unsigned long phys_addr, unsigned long size)
 {
-       struct acpi_table_srat  *srat;
+       struct acpi_table_srat *srat;
 
        if (!phys_addr || !size)
                return -EINVAL;
 
-       srat = (struct acpi_table_srat *) __va(phys_addr);
+       srat = (struct acpi_table_srat *)__va(phys_addr);
 
        return 0;
 }
 
-
 int __init
-acpi_table_parse_srat (
-       enum acpi_srat_entry_id id,
-       acpi_madt_entry_handler handler,
-       unsigned int max_entries)
+acpi_table_parse_srat(enum acpi_srat_entry_id id,
+                     acpi_madt_entry_handler handler, unsigned int max_entries)
 {
-       return acpi_table_parse_madt_family(ACPI_SRAT, sizeof(struct acpi_table_srat),
-                                           id, handler, max_entries);
+       return acpi_table_parse_madt_family(ACPI_SRAT,
+                                           sizeof(struct acpi_table_srat), id,
+                                           handler, max_entries);
 }
 
-
-int __init
-acpi_numa_init(void)
+int __init acpi_numa_init(void)
 {
-       int                     result;
+       int result;
 
        /* SRAT: Static Resource Affinity Table */
        result = acpi_table_parse(ACPI_SRAT, acpi_parse_srat);
@@ -181,9 +180,7 @@ acpi_numa_init(void)
                result = acpi_table_parse_srat(ACPI_SRAT_PROCESSOR_AFFINITY,
                                               acpi_parse_processor_affinity,
                                               NR_CPUS);
-               result = acpi_table_parse_srat(ACPI_SRAT_MEMORY_AFFINITY,
-                                              acpi_parse_memory_affinity,
-                                              NR_NODE_MEMBLKS);        // IA64 specific
+               result = acpi_table_parse_srat(ACPI_SRAT_MEMORY_AFFINITY, acpi_parse_memory_affinity, NR_NODE_MEMBLKS); // IA64 specific
        }
 
        /* SLIT: System Locality Information Table */
@@ -193,8 +190,7 @@ acpi_numa_init(void)
        return 0;
 }
 
-int
-acpi_get_pxm(acpi_handle h)
+int acpi_get_pxm(acpi_handle h)
 {
        unsigned long pxm;
        acpi_status status;
@@ -207,7 +203,8 @@ acpi_get_pxm(acpi_handle h)
                if (ACPI_SUCCESS(status))
                        return (int)pxm;
                status = acpi_get_parent(handle, &phandle);
-       } while(ACPI_SUCCESS(status));
+       } while (ACPI_SUCCESS(status));
        return -1;
 }
+
 EXPORT_SYMBOL(acpi_get_pxm);