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

Commit 0b23e30b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: remove sched-design.txt from 00-INDEX
  sched: change sched_debug's mode to 0444
parents 147db6e9 a0e5ebdc

Documentation/scheduler/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ sched-arch.txt 
	- CPU Scheduler implementation hints for architecture specific code.

sched-coding.txt

	- reference for various scheduler-related methods in the O(1) scheduler.

sched-design.txt

	- goals, design and implementation of the Linux O(1) scheduler.

sched-design-CFS.txt

	- goals, design and implementation of the Complete Fair Scheduler.

sched-domains.txt

kernel/sched_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int __init init_sched_debug_procfs(void) 
{

	struct proc_dir_entry *pe;



	pe = proc_create("sched_debug", 0644, NULL, &sched_debug_fops);

	pe = proc_create("sched_debug", 0444, NULL, &sched_debug_fops);

	if (!pe)

		return -ENOMEM;

	return 0;