ll_rw_blk: blk_cpu_notifier should be __cpuinitdata

[linux-2.6-omap-h63xx.git] / include / linux / topology.h

diff --git a/include/linux/topology.h b/include/linux/topology.h
index da6c39b2d051c30c7ec14df2b8f3b27115569ddc..525d437b12538ba780f5639a1fa73b3628ea40da 100644 (file)
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -50,10 +50,10 @@
        for_each_online_node(node)                                              \
                if (nr_cpus_node(node))
 
-#ifndef node_distance
 /* Conform to ACPI 2.0 SLIT distance definitions */
 #define LOCAL_DISTANCE         10
 #define REMOTE_DISTANCE                20
+#ifndef node_distance
 #define node_distance(from,to) ((from) == (to) ? LOCAL_DISTANCE : REMOTE_DISTANCE)
 #endif
 #ifndef RECLAIM_DISTANCE
@@ -185,7 +185,6 @@
        .max_interval           = 64*num_online_cpus(), \
        .busy_factor            = 128,                  \
        .imbalance_pct          = 133,                  \
-       .cache_hot_time         = (10*1000000),         \
        .cache_nice_tries       = 1,                    \
        .busy_idx               = 3,                    \
        .idle_idx               = 3,                    \