diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-14 17:22:45 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-14 17:22:45 -0400 |
| commit | f3ce717e60572421f56d89c9a85ac42e634d16e7 (patch) | |
| tree | 46b85329773c7908378f90e4e8e86205ebfd229f /drivers/acpi/numa.c | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
| parent | e73d3136355f511d3e1c2ef21acf02b19bd2b650 (diff) | |
Merge back earlier 'acpi-assorted' material
Diffstat (limited to 'drivers/acpi/numa.c')
| -rw-r--r-- | drivers/acpi/numa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index 33e609f63585..2e82e5d76930 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c | |||
| @@ -159,7 +159,7 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header) | |||
| 159 | * distance than the others. | 159 | * distance than the others. |
| 160 | * Do some quick checks here and only use the SLIT if it passes. | 160 | * Do some quick checks here and only use the SLIT if it passes. |
| 161 | */ | 161 | */ |
| 162 | static __init int slit_valid(struct acpi_table_slit *slit) | 162 | static int __init slit_valid(struct acpi_table_slit *slit) |
| 163 | { | 163 | { |
| 164 | int i, j; | 164 | int i, j; |
| 165 | int d = slit->locality_count; | 165 | int d = slit->locality_count; |