f363d16fbb
Strip __cpuinit[data] from Node <-> PXM routines and supporting data structures. Also make pxm_to_node_map and node_to_pxm_map local to the numa acpi module. This fixes a bug triggered by the following conditions: - boot on a machine with a SLIT table defined - kernel is configured w/ CONFIG_HOTPLUG_CPU=n - cat /sys/devices/system/node/node*/distance This will cause an oops by calling into a freed memory section. In particular, on x86_64, __node_distance calls node_to_pxm(). Signed-off-by: Aaron Durbin <adurbin@google.com> Cc: Len Brown <lenb@kernel.org> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
20 lines
486 B
C
20 lines
486 B
C
#ifndef __ACPI_NUMA_H
|
|
#define __ACPI_NUMA_H
|
|
|
|
#ifdef CONFIG_ACPI_NUMA
|
|
#include <linux/kernel.h>
|
|
|
|
/* Proximity bitmap length */
|
|
#if MAX_NUMNODES > 256
|
|
#define MAX_PXM_DOMAINS MAX_NUMNODES
|
|
#else
|
|
#define MAX_PXM_DOMAINS (256) /* Old pxm spec is defined 8 bit */
|
|
#endif
|
|
|
|
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);
|
|
|
|
#endif /* CONFIG_ACPI_NUMA */
|
|
#endif /* __ACP_NUMA_H */
|