5 files changed, 19 insertions, 15 deletions

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index cf5cfdf8d613..089bfb1fa01a 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -49,8 +49,6 @@ struct hrtimer_base;
  * struct hrtimer - the basic hrtimer structure
  *
  * @node:       red black tree node for time ordered insertion
- * @list:       list head for easier access to the time ordered list,
- *              without walking the red black tree.
  * @expires:    the absolute expiry time in the hrtimers internal
  *              representation. The time is related to the clock on
  *              which the timer is based.
@@ -63,7 +61,6 @@ struct hrtimer_base;
  */
 struct hrtimer {
         struct rb_node          node;
-        struct list_head        list;
         ktime_t                 expires;
         enum hrtimer_state      state;
         int                     (*function)(void *);
@@ -78,7 +75,7 @@ struct hrtimer {
  *              to a base on another cpu.
  * @lock:       lock protecting the base and associated timers
  * @active:     red black tree root node for the active timers
- * @pending:    list of pending timers for simple time ordered access
+ * @first:      pointer to the timer node which expires first
  * @resolution: the resolution of the clock, in nanoseconds
  * @get_time:   function to retrieve the current time of the clock
  * @curr_timer: the timer which is executing a callback right now
@@ -87,8 +84,8 @@ struct hrtimer_base {
         clockid_t               index;
         spinlock_t              lock;
         struct rb_root          active;
-        struct list_head        pending;
-        unsigned long           resolution;
+        struct rb_node          *first;
+        ktime_t                 resolution;
         ktime_t                 (*get_time)(void);
         struct hrtimer          *curr_timer;
 };
@@ -125,8 +122,7 @@ static inline int hrtimer_active(const struct hrtimer *timer)
 }
 
 /* Forward a hrtimer so it expires after now: */
-extern unsigned long hrtimer_forward(struct hrtimer *timer,
-                                     const ktime_t interval);
+extern unsigned long hrtimer_forward(struct hrtimer *timer, ktime_t interval);
 
 /* Precise sleep: */
 extern long hrtimer_nanosleep(struct timespec *rqtp,
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 9a8c05dbe4f3..f2e1b5b22898 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1002,7 +1002,6 @@ extern int noautodma;
 
 extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs);
 extern int __ide_end_request (ide_drive_t *drive, struct request *rq, int uptodate, int nrsecs);
-extern void ide_softirq_done(struct request *rq);
 
 /*
  * This is used on exit from the driver to designate the next irq handler
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index 222a047cc145..1bd6552cc341 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -272,8 +272,8 @@ static inline u64 ktime_to_ns(const ktime_t kt)
  * idea of the (in)accuracy of timers. Timer values are rounded up to
  * this resolution values.
  */
-#define KTIME_REALTIME_RES      (NSEC_PER_SEC/HZ)
-#define KTIME_MONOTONIC_RES     (NSEC_PER_SEC/HZ)
+#define KTIME_REALTIME_RES      (ktime_t){ .tv64 = TICK_NSEC }
+#define KTIME_MONOTONIC_RES     (ktime_t){ .tv64 = TICK_NSEC }
 
 /* Get the monotonic time in timespec format: */
 extern void ktime_get_ts(struct timespec *ts);
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,                    \