Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: fix section mismatch
  sched: fix double kfree in failure path
  sched: clean up arch_reinit_sched_domains()
  sched: mark sched_create_sysfs_power_savings_entries() as __init
  getrusage: RUSAGE_THREAD should return ru_utime and ru_stime
  sched: fix sched_slice()
  sched_clock: prevent scd->clock from moving backwards, take #2
  sched: sched.c declare variables before they get used

diff --combined include/linux/sched.h
index ea415136ac9e27ff150ac995fddd867145c019f6,c8a90bee263950bcc7e3f7487e26d29ee516e15a..4cae9b81a1f8851d51a5380d8d37fa7ba3ceb529
--- 1/include/linux/sched.h
--- 2/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -386,9 -386,6 +386,9 @@@ extern void arch_unmap_area_topdown(str
                (mm)->hiwater_vm = (mm)->total_vm;      \
  } while (0)
  
 +#define get_mm_hiwater_rss(mm)        max((mm)->hiwater_rss, get_mm_rss(mm))
 +#define get_mm_hiwater_vm(mm) max((mm)->hiwater_vm, (mm)->total_vm)
 +
  extern void set_dumpable(struct mm_struct *mm, int value);
  extern int get_dumpable(struct mm_struct *mm);
  
@@@ -915,7 -912,6 +915,6 @@@ static inline struct cpumask *sched_dom
  
  extern void partition_sched_domains(int ndoms_new, struct cpumask *doms_new,
                                    struct sched_domain_attr *dattr_new);
- extern int arch_reinit_sched_domains(void);
  
  /* Test a flag in parent sched domain */
  static inline int test_sd_parent(struct sched_domain *sd, int flag)
@@@ -1707,16 -1703,16 +1706,16 @@@ extern void wake_up_idle_cpu(int cpu)
  static inline void wake_up_idle_cpu(int cpu) { }
  #endif
  
- #ifdef CONFIG_SCHED_DEBUG
  extern unsigned int sysctl_sched_latency;
  extern unsigned int sysctl_sched_min_granularity;
  extern unsigned int sysctl_sched_wakeup_granularity;
+ extern unsigned int sysctl_sched_shares_ratelimit;
+ extern unsigned int sysctl_sched_shares_thresh;
+ #ifdef CONFIG_SCHED_DEBUG
  extern unsigned int sysctl_sched_child_runs_first;
  extern unsigned int sysctl_sched_features;
  extern unsigned int sysctl_sched_migration_cost;
  extern unsigned int sysctl_sched_nr_migrate;
- extern unsigned int sysctl_sched_shares_ratelimit;
- extern unsigned int sysctl_sched_shares_thresh;
  
  int sched_nr_latency_handler(struct ctl_table *table, int write,
                struct file *file, void __user *buffer, size_t *length,

diff --combined kernel/sys.c
index 4a43617cd565d08506aaa590be041e05ae3d7ab6,61dbfd4a54dfbb430ca72fb5bfedcbc279a4ccf4..763c3c17ded3e6c818283da75dd0865b93858c7a
--- 1/kernel/sys.c
--- 2/kernel/sys.c
+++ b/kernel/sys.c
@@@ -33,7 -33,6 +33,7 @@@
  #include <linux/task_io_accounting_ops.h>
  #include <linux/seccomp.h>
  #include <linux/cpu.h>
 +#include <linux/ptrace.h>
  
  #include <linux/compat.h>
  #include <linux/syscalls.h>
@@@ -928,7 -927,6 +928,7 @@@ asmlinkage long sys_times(struct tms __
                if (copy_to_user(tbuf, &tmp, sizeof(struct tms)))
                        return -EFAULT;
        }
 +      force_successful_syscall_return();
        return (long) jiffies_64_to_clock_t(get_jiffies_64());
  }
  
@@@ -1629,6 -1627,8 +1629,8 @@@ static void k_getrusage(struct task_str
        utime = stime = cputime_zero;
  
        if (who == RUSAGE_THREAD) {
+               utime = task_utime(current);
+               stime = task_stime(current);
                accumulate_thread_rusage(p, r);
                goto out;
        }