diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-24 17:48:01 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-03 12:39:38 -0500 |
commit | d79ed248d923f219053760376a33371894a6d47c (patch) | |
tree | 1c40dcbbf21da3902d4766290e93c33409e44775 | |
parent | 962fe9c91c5faa271e21c6ef589ff1df02fa13ed (diff) |
ACPI / numa: Make __acpi_map_pxm_to_node(), acpi_get_pxm() static
__acpi_map_pxm_to_node() and acpi_get_pxm() are only used within
drivers/acpi/numa.c. This makes them static and removes their
declarations.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | drivers/acpi/numa.c | 4 | ||||
-rw-r--r-- | include/acpi/acpi_numa.h | 1 | ||||
-rw-r--r-- | include/linux/acpi.h | 5 |
3 files changed, 2 insertions, 8 deletions
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index a7e779bfa2f6..359a43bdd948 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c | |||
@@ -60,7 +60,7 @@ int node_to_pxm(int node) | |||
60 | return node_to_pxm_map[node]; | 60 | return node_to_pxm_map[node]; |
61 | } | 61 | } |
62 | 62 | ||
63 | void __acpi_map_pxm_to_node(int pxm, int node) | 63 | static void __acpi_map_pxm_to_node(int pxm, int node) |
64 | { | 64 | { |
65 | if (pxm_to_node_map[pxm] == NUMA_NO_NODE || node < pxm_to_node_map[pxm]) | 65 | if (pxm_to_node_map[pxm] == NUMA_NO_NODE || node < pxm_to_node_map[pxm]) |
66 | pxm_to_node_map[pxm] = node; | 66 | pxm_to_node_map[pxm] = node; |
@@ -314,7 +314,7 @@ int __init acpi_numa_init(void) | |||
314 | return 0; | 314 | return 0; |
315 | } | 315 | } |
316 | 316 | ||
317 | int acpi_get_pxm(acpi_handle h) | 317 | static int acpi_get_pxm(acpi_handle h) |
318 | { | 318 | { |
319 | unsigned long long pxm; | 319 | unsigned long long pxm; |
320 | acpi_status status; | 320 | acpi_status status; |
diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h index 451823cb8837..94a37cd7fbda 100644 --- a/include/acpi/acpi_numa.h +++ b/include/acpi/acpi_numa.h | |||
@@ -13,7 +13,6 @@ | |||
13 | 13 | ||
14 | extern int pxm_to_node(int); | 14 | extern int pxm_to_node(int); |
15 | extern int node_to_pxm(int); | 15 | extern int node_to_pxm(int); |
16 | extern void __acpi_map_pxm_to_node(int, int); | ||
17 | extern int acpi_map_pxm_to_node(int); | 16 | extern int acpi_map_pxm_to_node(int); |
18 | extern unsigned char acpi_srat_revision; | 17 | extern unsigned char acpi_srat_revision; |
19 | 18 | ||
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 17bee650a0cb..6c29abbefd41 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -259,13 +259,8 @@ extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d); | |||
259 | extern void acpi_osi_setup(char *str); | 259 | extern void acpi_osi_setup(char *str); |
260 | 260 | ||
261 | #ifdef CONFIG_ACPI_NUMA | 261 | #ifdef CONFIG_ACPI_NUMA |
262 | int acpi_get_pxm(acpi_handle handle); | ||
263 | int acpi_get_node(acpi_handle handle); | 262 | int acpi_get_node(acpi_handle handle); |
264 | #else | 263 | #else |
265 | static inline int acpi_get_pxm(acpi_handle handle) | ||
266 | { | ||
267 | return 0; | ||
268 | } | ||
269 | static inline int acpi_get_node(acpi_handle handle) | 264 | static inline int acpi_get_node(acpi_handle handle) |
270 | { | 265 | { |
271 | return 0; | 266 | return 0; |