Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65b2074f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-core-for-linus' of... 

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

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits)
  sched: Change wait_for_completion_*_timeout() to return a signed long
  sched, autogroup: Fix reference leak
  sched, autogroup: Fix potential access to freed memory
  sched: Remove redundant CONFIG_CGROUP_SCHED ifdef
  sched: Fix interactivity bug by charging unaccounted run-time on entity re-weight
  sched: Move periodic share updates to entity_tick()
  printk: Use this_cpu_{read|write} api on printk_pending
  sched: Make pushable_tasks CONFIG_SMP dependant
  sched: Add 'autogroup' scheduling feature: automated per session task groups
  sched: Fix unregister_fair_sched_group()
  sched: Remove unused argument dest_cpu to migrate_task()
  mutexes, sched: Introduce arch_mutex_cpu_relax()
  sched: Add some clock info to sched_debug
  cpu: Remove incorrect BUG_ON
  cpu: Remove unused variable
  sched: Fix UP build breakage
  sched: Make task dump print all 15 chars of proc comm
  sched: Update tg->shares after cpu.shares write
  sched: Allow update_cfs_load() to update global load
  sched: Implement demand based update_cfs_load()
  ...
parents 28d9bfc3 6bf41237

Documentation/kernel-parameters.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -1614,6 +1614,8 @@ and is between 256 and 4096 characters. It is defined in the file 
	noapic		[SMP,APIC] Tells the kernel to not make use of any

	noapic		[SMP,APIC] Tells the kernel to not make use of any

			IOAPICs that may be present in the system.

			IOAPICs that may be present in the system.





	noautogroup	Disable scheduler automatic task group creation.



	nobats		[PPC] Do not use BATs for mapping kernel lowmem

	nobats		[PPC] Do not use BATs for mapping kernel lowmem

			on "Classic" PPC cores.

			on "Classic" PPC cores.

arch/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -175,4 +175,7 @@ config HAVE_PERF_EVENTS_NMI 
config HAVE_ARCH_JUMP_LABEL

config HAVE_ARCH_JUMP_LABEL

	bool

	bool





config HAVE_ARCH_MUTEX_CPU_RELAX

	bool



source "kernel/gcov/Kconfig"
 
source "kernel/gcov/Kconfig"

arch/s390/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -99,6 +99,7 @@ config S390 
	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_LZO

	select HAVE_GET_USER_PAGES_FAST

	select HAVE_GET_USER_PAGES_FAST

	select HAVE_ARCH_MUTEX_CPU_RELAX

	select ARCH_INLINE_SPIN_TRYLOCK

	select ARCH_INLINE_SPIN_TRYLOCK

	select ARCH_INLINE_SPIN_TRYLOCK_BH

	select ARCH_INLINE_SPIN_TRYLOCK_BH

	select ARCH_INLINE_SPIN_LOCK

	select ARCH_INLINE_SPIN_LOCK

arch/s390/include/asm/mutex.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -7,3 +7,5 @@ 
 */

 */





#include <asm-generic/mutex-dec.h>

#include <asm-generic/mutex-dec.h>



#define arch_mutex_cpu_relax()	barrier()

fs/proc/base.c

+79 −0
Original line number Original line Diff line number Diff line
@@ -1407,6 +1407,82 @@ static const struct file_operations proc_pid_sched_operations = { 




#endif

#endif





#ifdef CONFIG_SCHED_AUTOGROUP

/*

 * Print out autogroup related information:

 */

static int sched_autogroup_show(struct seq_file *m, void *v)

{

	struct inode *inode = m->private;

	struct task_struct *p;



	p = get_proc_task(inode);

	if (!p)

		return -ESRCH;

	proc_sched_autogroup_show_task(p, m);



	put_task_struct(p);



	return 0;

}



static ssize_t

sched_autogroup_write(struct file *file, const char __user *buf,

	    size_t count, loff_t *offset)

{

	struct inode *inode = file->f_path.dentry->d_inode;

	struct task_struct *p;

	char buffer[PROC_NUMBUF];

	long nice;

	int err;



	memset(buffer, 0, sizeof(buffer));

	if (count > sizeof(buffer) - 1)

		count = sizeof(buffer) - 1;

	if (copy_from_user(buffer, buf, count))

		return -EFAULT;



	err = strict_strtol(strstrip(buffer), 0, &nice);

	if (err)

		return -EINVAL;



	p = get_proc_task(inode);

	if (!p)

		return -ESRCH;



	err = nice;

	err = proc_sched_autogroup_set_nice(p, &err);

	if (err)

		count = err;



	put_task_struct(p);



	return count;

}



static int sched_autogroup_open(struct inode *inode, struct file *filp)

{

	int ret;



	ret = single_open(filp, sched_autogroup_show, NULL);

	if (!ret) {

		struct seq_file *m = filp->private_data;



		m->private = inode;

	}

	return ret;

}



static const struct file_operations proc_pid_sched_autogroup_operations = {

	.open		= sched_autogroup_open,

	.read		= seq_read,

	.write		= sched_autogroup_write,

	.llseek		= seq_lseek,

	.release	= single_release,

};



#endif /* CONFIG_SCHED_AUTOGROUP */



static ssize_t comm_write(struct file *file, const char __user *buf,

static ssize_t comm_write(struct file *file, const char __user *buf,

				size_t count, loff_t *offset)

				size_t count, loff_t *offset)

{

{
@@ -2732,6 +2808,9 @@ static const struct pid_entry tgid_base_stuff[] = { 
	INF("limits",	  S_IRUGO, proc_pid_limits),

	INF("limits",	  S_IRUGO, proc_pid_limits),

#ifdef CONFIG_SCHED_DEBUG

#ifdef CONFIG_SCHED_DEBUG

	REG("sched",      S_IRUGO|S_IWUSR, proc_pid_sched_operations),

	REG("sched",      S_IRUGO|S_IWUSR, proc_pid_sched_operations),

#endif

#ifdef CONFIG_SCHED_AUTOGROUP

	REG("autogroup",  S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),

#endif

#endif

	REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),

	REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),

#ifdef CONFIG_HAVE_ARCH_TRACEHOOK

#ifdef CONFIG_HAVE_ARCH_TRACEHOOK