git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull cpumask into release branch
[pandora-kernel.git]
/
arch
/
ia64
/
include
/
asm
/
topology.h
diff --git
a/arch/ia64/include/asm/topology.h
b/arch/ia64/include/asm/topology.h
index
32f3af1
..
7b4c8c7
100644
(file)
--- a/
arch/ia64/include/asm/topology.h
+++ b/
arch/ia64/include/asm/topology.h
@@
-43,11
+43,6
@@
*/
#define parent_node(nid) (nid)
*/
#define parent_node(nid) (nid)
-/*
- * Returns the number of the first CPU on Node 'node'.
- */
-#define node_to_first_cpu(node) (cpumask_first(cpumask_of_node(node)))
-
/*
* Determines the node for a given pci bus
*/
/*
* Determines the node for a given pci bus
*/
@@
-84,7
+79,7
@@
void build_cpu_to_node_map(void);
.child = NULL, \
.groups = NULL, \
.min_interval = 8, \
.child = NULL, \
.groups = NULL, \
.min_interval = 8, \
- .max_interval = 8*(min(num_online_cpus(), 32)), \
+ .max_interval = 8*(min(num_online_cpus(), 32
U
)), \
.busy_factor = 64, \
.imbalance_pct = 125, \
.cache_nice_tries = 2, \
.busy_factor = 64, \
.imbalance_pct = 125, \
.cache_nice_tries = 2, \
@@
-117,11
+112,6
@@
void build_cpu_to_node_map(void);
extern void arch_fix_phys_package_id(int num, u32 slot);
extern void arch_fix_phys_package_id(int num, u32 slot);
-#define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ? \
- CPU_MASK_ALL : \
- node_to_cpumask(pcibus_to_node(bus)) \
- )
-
#define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \
cpu_all_mask : \
cpumask_of_node(pcibus_to_node(bus)))
#define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \
cpu_all_mask : \
cpumask_of_node(pcibus_to_node(bus)))