Merge remote-tracking branch 'remotes/origin/p/anton.e/master' into p/sechting/merge
authorRené Sechting <sechting@mailbox.tu-berlin.de>
Thu, 12 Dec 2013 17:14:26 +0000 (18:14 +0100)
committerRené Sechting <sechting@mailbox.tu-berlin.de>
Thu, 12 Dec 2013 17:14:26 +0000 (18:14 +0100)
Conflicts:
kernel/sched/Makefile
kernel/sched/modsched/Makefile

1  2 
kernel/sched/cfs/core.c
kernel/sched/modsched/Makefile
kernel/sched/modsched/core.c

Simple merge
@@@ -18,8 -18,5 +18,4 @@@ obj-y += core.o clock.o cputime.
  #obj-$(CONFIG_SCHEDSTATS) += stats.o
  #obj-$(CONFIG_SCHED_DEBUG) += debug.o
  
- kernel/sched.new/mod_sched.o:
-       cd $(PWD)/build;\
-       rm -f kernel/sched.new/mod_sched.o;\
-       make -f $(MOD_SCHED_DIR)/Makefile clean;\
-       make -f $(MOD_SCHED_DIR)/Makefile all;
+ obj-y += framework/
 -
@@@ -1291,12 -1251,10 +1292,13 @@@ ttwu_do_activate(struct rq *rq, struct 
   */
  static void ttwu_queue_remote(struct task_struct *p, int cpu)
  {
 +//    printk(">>ttwu_queue_remote\n");
 +#if defined(CONFIG_SMP)
        if (llist_add(&p->wake_entry, &cpu_rq(cpu)->wake_list))
                smp_send_reschedule(cpu);
 +#endif
  }
+ #endif
  
  /*
   * kernel/sched/core.c:1406