2 files changed, 13 insertions, 4 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 3b74c4bf2934..a72e17135421 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -631,7 +631,14 @@ struct sched_domain {
 
 extern void partition_sched_domains(cpumask_t *partition1,
                                     cpumask_t *partition2);
-#endif /* CONFIG_SMP */
+
+/*
+ * Maximum cache size the migration-costs auto-tuning code will
+ * search from:
+ */
+extern unsigned int max_cache_size;
+
+#endif  /* CONFIG_SMP */
 
 
 struct io_context;                      /* See blkdev.h */
@@ -689,9 +696,12 @@ struct task_struct {
 
         int lock_depth;         /* BKL lock depth */
 
-#if defined(CONFIG_SMP) && defined(__ARCH_WANT_UNLOCKED_CTXSW)
+#if defined(CONFIG_SMP)
+        int last_waker_cpu;     /* CPU that last woke this task up */
+#if defined(__ARCH_WANT_UNLOCKED_CTXSW)
         int oncpu;
 #endif
+#endif
         int prio, static_prio;
         struct list_head run_list;
         prio_array_t *array;
@@ -1230,6 +1240,7 @@ static inline void task_unlock(struct task_struct *p)
 #ifndef __HAVE_THREAD_FUNCTIONS
 
 #define task_thread_info(task) (task)->thread_info
+#define task_stack_page(task) ((void*)((task)->thread_info))
 
 static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org)
 {
diff --git a/include/linux/topology.h b/include/linux/topology.h
index 3df1d474e5c5..315a5163d6a0 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -86,7 +86,6 @@
         .max_interval           = 2,                    \
         .busy_factor            = 8,                    \
         .imbalance_pct          = 110,                  \
-        .cache_hot_time         = 0,                    \
         .cache_nice_tries       = 0,                    \
         .per_cpu_gain           = 25,                   \
         .busy_idx               = 0,                    \
@@ -117,7 +116,6 @@
         .max_interval           = 4,                    \
         .busy_factor            = 64,                   \
         .imbalance_pct          = 125,                  \
-        .cache_hot_time         = (5*1000000/2),        \
         .cache_nice_tries       = 1,                    \
         .per_cpu_gain           = 100,                  \
         .busy_idx               = 2,                    \