aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-01-24 17:25:10 -0500
committerBjorn Helgaas <bhelgaas@google.com>2014-02-03 12:39:27 -0500
commit486c79b5002e4a75c1c3614180702196ec6d904d (patch)
tree975743ad7c40456e5a022e3d3509bd4c3ecc05e5
parentb1e9cee7f68620fa2a020e35b5fbe3c4cc780e84 (diff)
ACPI / numa: Fix acpi_get_node() prototype
acpi_get_node() takes an acpi_handle, not an "acpi_handle *". This fixes the prototype and the definitions. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/numa.c2
-rw-r--r--include/linux/acpi.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 9e6816ef280a..dab7dac6b1a8 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -331,7 +331,7 @@ int acpi_get_pxm(acpi_handle h)
331 return -1; 331 return -1;
332} 332}
333 333
334int acpi_get_node(acpi_handle *handle) 334int acpi_get_node(acpi_handle handle)
335{ 335{
336 int pxm, node = NUMA_NO_NODE; 336 int pxm, node = NUMA_NO_NODE;
337 337
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 1151a1dcfe41..17bee650a0cb 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -260,13 +260,13 @@ extern void acpi_osi_setup(char *str);
260 260
261#ifdef CONFIG_ACPI_NUMA 261#ifdef CONFIG_ACPI_NUMA
262int acpi_get_pxm(acpi_handle handle); 262int acpi_get_pxm(acpi_handle handle);
263int acpi_get_node(acpi_handle *handle); 263int acpi_get_node(acpi_handle handle);
264#else 264#else
265static inline int acpi_get_pxm(acpi_handle handle) 265static inline int acpi_get_pxm(acpi_handle handle)
266{ 266{
267 return 0; 267 return 0;
268} 268}
269static inline int acpi_get_node(acpi_handle *handle) 269static inline int acpi_get_node(acpi_handle handle)
270{ 270{
271 return 0; 271 return 0;
272} 272}