|
@@ -18,6 +18,9 @@
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
*
|
|
*
|
|
*/
|
|
*/
|
|
|
|
+
|
|
|
|
+#define pr_fmt(fmt) "ACPI: " fmt
|
|
|
|
+
|
|
#include <linux/module.h>
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/kernel.h>
|
|
@@ -28,8 +31,6 @@
|
|
#include <linux/nodemask.h>
|
|
#include <linux/nodemask.h>
|
|
#include <linux/topology.h>
|
|
#include <linux/topology.h>
|
|
|
|
|
|
-#define PREFIX "ACPI: "
|
|
|
|
-
|
|
|
|
#define ACPI_NUMA 0x80000000
|
|
#define ACPI_NUMA 0x80000000
|
|
#define _COMPONENT ACPI_NUMA
|
|
#define _COMPONENT ACPI_NUMA
|
|
ACPI_MODULE_NAME("numa");
|
|
ACPI_MODULE_NAME("numa");
|
|
@@ -187,9 +188,8 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header)
|
|
#endif /* ACPI_DEBUG_OUTPUT */
|
|
#endif /* ACPI_DEBUG_OUTPUT */
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|
|
- printk(KERN_WARNING PREFIX
|
|
|
|
- "Found unsupported SRAT entry (type = 0x%x)\n",
|
|
|
|
- header->type);
|
|
|
|
|
|
+ pr_warn("Found unsupported SRAT entry (type = 0x%x)\n",
|
|
|
|
+ header->type);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -222,7 +222,7 @@ static int __init acpi_parse_slit(struct acpi_table_header *table)
|
|
struct acpi_table_slit *slit = (struct acpi_table_slit *)table;
|
|
struct acpi_table_slit *slit = (struct acpi_table_slit *)table;
|
|
|
|
|
|
if (!slit_valid(slit)) {
|
|
if (!slit_valid(slit)) {
|
|
- printk(KERN_INFO "ACPI: SLIT table looks invalid. Not used.\n");
|
|
|
|
|
|
+ pr_info("SLIT table looks invalid. Not used.\n");
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
acpi_numa_slit_init(slit);
|
|
acpi_numa_slit_init(slit);
|
|
@@ -233,12 +233,9 @@ static int __init acpi_parse_slit(struct acpi_table_header *table)
|
|
void __init __weak
|
|
void __init __weak
|
|
acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
|
|
acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
|
|
{
|
|
{
|
|
- printk(KERN_WARNING PREFIX
|
|
|
|
- "Found unsupported x2apic [0x%08x] SRAT entry\n", pa->apic_id);
|
|
|
|
- return;
|
|
|
|
|
|
+ pr_warn("Found unsupported x2apic [0x%08x] SRAT entry\n", pa->apic_id);
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
static int __init
|
|
static int __init
|
|
acpi_parse_x2apic_affinity(struct acpi_subtable_header *header,
|
|
acpi_parse_x2apic_affinity(struct acpi_subtable_header *header,
|
|
const unsigned long end)
|
|
const unsigned long end)
|