diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-15 11:26:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-15 11:26:03 -0400 |
| commit | 5006ecc2d5073d4e52f54381fd0fee1575d4ce22 (patch) | |
| tree | bedfff6f96118771b809de30e559cc370f94c7be /include/asm-powerpc/topology.h | |
| parent | acc696d93dcf993dec123d69d599979e1456ffec (diff) | |
| parent | 9be2f7c38e0bd64e8a0f74ea68df1e73e2ddfcc3 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-powerpc/topology.h')
| -rw-r--r-- | include/asm-powerpc/topology.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/include/asm-powerpc/topology.h b/include/asm-powerpc/topology.h index 1e19cd00af2..87362a05542 100644 --- a/include/asm-powerpc/topology.h +++ b/include/asm-powerpc/topology.h @@ -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 */ |