Merge ../linux-2.6/

[sfrench/cifs-2.6.git] / include / asm-ia64 / topology.h

diff --git a/include/asm-ia64/topology.h b/include/asm-ia64/topology.h
index 3ee19dfa46dfde66f5723030f5a0e3a9e114bca6..937c212575239f3ec9ee9526e2c989289669f967 100644 (file)
--- a/include/asm-ia64/topology.h
+++ b/include/asm-ia64/topology.h
@@ -22,6 +22,11 @@
 /* Nodes w/o CPUs are preferred for memory allocations, see build_zonelists */
 #define PENALTY_FOR_NODE_WITH_CPUS 255
 
+/*
+ * Distance above which we begin to use zone reclaim
+ */
+#define RECLAIM_DISTANCE 15
+
 /*
  * Returns the number of the node containing CPU 'cpu'
  */
@@ -107,6 +112,7 @@ void build_cpu_to_node_map(void);
 #define topology_core_id(cpu)                  (cpu_data(cpu)->core_id)
 #define topology_core_siblings(cpu)            (cpu_core_map[cpu])
 #define topology_thread_siblings(cpu)          (cpu_sibling_map[cpu])
+#define smt_capable()                          (smp_num_siblings > 1)
 #endif
 
 #include <asm-generic/topology.h>