git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
asm-powerpc
/
topology.h
diff --git
a/include/asm-powerpc/topology.h
b/include/asm-powerpc/topology.h
index
87362a0
..
1e19cd0
100644
(file)
--- a/
include/asm-powerpc/topology.h
+++ b/
include/asm-powerpc/topology.h
@@
-4,9
+4,6
@@
#include <linux/config.h>
#include <linux/config.h>
-struct sys_device;
-struct device_node;
-
#ifdef CONFIG_NUMA
#include <asm/mmzone.h>
#ifdef CONFIG_NUMA
#include <asm/mmzone.h>
@@
-30,8
+27,6
@@
static inline int node_to_first_cpu(int node)
return first_cpu(tmp);
}
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)
#define pcibus_to_node(node) (-1)
#define pcibus_to_cpumask(bus) (cpu_online_map)
@@
-62,29
+57,10
@@
int of_node_to_nid(struct device_node *device);
extern void __init dump_numa_cpu_topology(void);
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
#else
-static inline int of_node_to_nid(struct device_node *device)
-{
- return 0;
-}
-
static inline void dump_numa_cpu_topology(void) {}
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 */
#include <asm-generic/topology.h>
#endif /* CONFIG_NUMA */