[PATCH] powerpc: Allow devices to register with numa topology
Change of_node_to_nid() to traverse the device tree, looking for a numa id. Cell uses this to assign ids to SPUs, which are children of the CPU node. Existing users of of_node_to_nid() are altered to use of_node_to_nid_single(), which doesn't do the traversal. Export an attach_sysdev_to_node() function, allowing system devices (eg. SPUs) to link themselves into the numa topology in sysfs. Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
bed120c64e
commit
953039c8df
@@ -4,6 +4,9 @@
|
||||
|
||||
#include <linux/config.h>
|
||||
|
||||
struct sys_device;
|
||||
struct device_node;
|
||||
|
||||
#ifdef CONFIG_NUMA
|
||||
|
||||
#include <asm/mmzone.h>
|
||||
@@ -27,6 +30,8 @@ static inline int node_to_first_cpu(int node)
|
||||
return first_cpu(tmp);
|
||||
}
|
||||
|
||||
int of_node_to_nid(struct device_node *device);
|
||||
|
||||
#define pcibus_to_node(node) (-1)
|
||||
#define pcibus_to_cpumask(bus) (cpu_online_map)
|
||||
|
||||
@@ -57,10 +62,29 @@ static inline int node_to_first_cpu(int node)
|
||||
|
||||
extern void __init dump_numa_cpu_topology(void);
|
||||
|
||||
extern int sysfs_add_device_to_node(struct sys_device *dev, int nid);
|
||||
extern void sysfs_remove_device_from_node(struct sys_device *dev, int nid);
|
||||
|
||||
#else
|
||||
|
||||
static inline int of_node_to_nid(struct device_node *device)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline void dump_numa_cpu_topology(void) {}
|
||||
|
||||
static inline int sysfs_add_device_to_node(struct sys_device *dev, int nid)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline void sysfs_remove_device_from_node(struct sys_device *dev,
|
||||
int nid)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
#include <asm-generic/topology.h>
|
||||
|
||||
#endif /* CONFIG_NUMA */
|
||||
|
Reference in New Issue
Block a user