Merge branches 'sched/core', 'core/core' and 'tracing/core' into cpus4096

diff --cc arch/x86/Kconfig
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/Makefile
index 6a212b842d86b9c4f7afd40cf4af6c2f8269518b,19fad003b19d6ac0752597f5a23e18341d1d579a,03a45e7e87b71a9b103d390d632a3d57da9b7075..010ccb311166fe8708cd2f08d04a36c66d7365d5
--- 1/kernel/Makefile
--- 2/kernel/Makefile
--- 3/kernel/Makefile
+++ b/kernel/Makefile
@@@@ -19,7 -19,8 -19,12 +19,11 @@@@ CFLAGS_REMOVE_mutex-debug.o = -p
   CFLAGS_REMOVE_rtmutex-debug.o = -pg
   CFLAGS_REMOVE_cgroup-debug.o = -pg
   CFLAGS_REMOVE_sched_clock.o = -pg
 --CFLAGS_REMOVE_sched.o = -pg
 + endif
++ ifdef CONFIG_FUNCTION_RET_TRACER
++ CFLAGS_REMOVE_extable.o = -pg # For __kernel_text_address()
++ CFLAGS_REMOVE_module.o = -pg # For __module_text_address()
+  endif
   
   obj-$(CONFIG_FREEZER) += freezer.o
   obj-$(CONFIG_PROFILING) += profile.o

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/sched.c
index 338340a3fb89490bfc615d8c83a25119858dd1b3,558e5f284269bfd59a23008ad4906b51269047b2,388d9db044ab42c6e950de96c4298435c2d031b1..bb827651558e77da660b89b0820de57bbedad2a0
--- 1/kernel/sched.c
--- 2/kernel/sched.c
--- 3/kernel/sched.c
+++ b/kernel/sched.c
@@@@ -703,18 -703,45 -709,45 +709,18 @@@@ static __read_mostly char *sched_feat_n
   
   #undef SCHED_FEAT
   
 --static int sched_feat_open(struct inode *inode, struct file *filp)
  -{
  -     filp->private_data = inode->i_private;
  -     return 0;
  -}
  -
  -static ssize_t
  -sched_feat_read(struct file *filp, char __user *ubuf,
  -             size_t cnt, loff_t *ppos)
 ++static int sched_feat_show(struct seq_file *m, void *v)
   {
 -      filp->private_data = inode->i_private;
 -      return 0;
 - }
 - 
 - static ssize_t
 - sched_feat_read(struct file *filp, char __user *ubuf,
 -              size_t cnt, loff_t *ppos)
 - {
 --     char *buf;
 --     int r = 0;
 --     int len = 0;
        int i;
   
        for (i = 0; sched_feat_names[i]; i++) {
 --             len += strlen(sched_feat_names[i]);
 --             len += 4;
  -     }
  -
  -     buf = kmalloc(len + 2, GFP_KERNEL);
  -     if (!buf)
  -             return -ENOMEM;
  -
  -     for (i = 0; sched_feat_names[i]; i++) {
  -             if (sysctl_sched_features & (1UL << i))
  -                     r += sprintf(buf + r, "%s ", sched_feat_names[i]);
  -             else
  -                     r += sprintf(buf + r, "NO_%s ", sched_feat_names[i]);
 ++             if (!(sysctl_sched_features & (1UL << i)))
 ++                     seq_puts(m, "NO_");
 ++             seq_printf(m, "%s ", sched_feat_names[i]);
        }
 ++     seq_puts(m, "\n");
   
 -      buf = kmalloc(len + 2, GFP_KERNEL);
 -      if (!buf)
 -              return -ENOMEM;
 - 
 -      for (i = 0; sched_feat_names[i]; i++) {
 -              if (sysctl_sched_features & (1UL << i))
 -                      r += sprintf(buf + r, "%s ", sched_feat_names[i]);
 -              else
 -                      r += sprintf(buf + r, "NO_%s ", sched_feat_names[i]);
 -      }
 - 
 --     r += sprintf(buf + r, "\n");
 --     WARN_ON(r >= len + 2);
 --
 --     r = simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
 --
 --     kfree(buf);
 --
 --     return r;
 ++     return 0;
   }
   
   static ssize_t