Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
@@ -3,6 +3,9 @@
|
||||
#ifdef __KERNEL__
|
||||
|
||||
|
||||
struct sys_device;
|
||||
struct device_node;
|
||||
|
||||
#ifdef CONFIG_NUMA
|
||||
|
||||
#include <asm/mmzone.h>
|
||||
@@ -26,6 +29,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)
|
||||
|
||||
@@ -56,10 +61,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