From a383b4e775fa1834f480613813e4fc807e7fe56d Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 16 May 2007 22:11:06 -0700 Subject: [PATCH] --- yaml --- r: 56519 b: refs/heads/master c: f363d16fbb9374c0bd7f2757d412c287169094c9 h: refs/heads/master i: 56517: 6213b616e737f09e2683ee24693b78e717fe549c 56515: a8ed226faf491a51dc44e87979fcae90e4ea911a 56511: 6169015c2801e8b9c32c274e37a1a02c547cd785 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/numa.c | 8 ++++---- trunk/include/acpi/acpi_numa.h | 7 ++----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 507affbdd104..275f49114180 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0aa817f078b655d0ae36669169d73a5c8a388016 +refs/heads/master: f363d16fbb9374c0bd7f2757d412c287169094c9 diff --git a/trunk/drivers/acpi/numa.c b/trunk/drivers/acpi/numa.c index 8fcd6a15517f..a2efae8a4c4e 100644 --- a/trunk/drivers/acpi/numa.c +++ b/trunk/drivers/acpi/numa.c @@ -40,19 +40,19 @@ static nodemask_t nodes_found_map = NODE_MASK_NONE; #define NID_INVAL -1 /* maps to convert between proximity domain and logical node ID */ -int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS] +static int pxm_to_node_map[MAX_PXM_DOMAINS] = { [0 ... MAX_PXM_DOMAINS - 1] = NID_INVAL }; -int __cpuinitdata node_to_pxm_map[MAX_NUMNODES] +static int node_to_pxm_map[MAX_NUMNODES] = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL }; -int __cpuinit pxm_to_node(int pxm) +int pxm_to_node(int pxm) { if (pxm < 0) return NID_INVAL; return pxm_to_node_map[pxm]; } -int __cpuinit node_to_pxm(int node) +int node_to_pxm(int node) { if (node < 0) return PXM_INVAL; diff --git a/trunk/include/acpi/acpi_numa.h b/trunk/include/acpi/acpi_numa.h index f9d2bde9a7bb..b62cd36ff324 100644 --- a/trunk/include/acpi/acpi_numa.h +++ b/trunk/include/acpi/acpi_numa.h @@ -11,11 +11,8 @@ #define MAX_PXM_DOMAINS (256) /* Old pxm spec is defined 8 bit */ #endif -extern int __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS]; -extern int __cpuinitdata node_to_pxm_map[MAX_NUMNODES]; - -extern int __cpuinit pxm_to_node(int); -extern int __cpuinit node_to_pxm(int); +extern int pxm_to_node(int); +extern int node_to_pxm(int); extern int __cpuinit acpi_map_pxm_to_node(int); extern void __cpuinit acpi_unmap_pxm_to_node(int);