diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 18:32:03 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 18:32:03 -0700 |
commit | 0b23e30b48b0b634fdc8c8198ea9dfec8c091968 (patch) | |
tree | d4c172bda3212250c44a07b24968877d414eb496 | |
parent | 147db6e9474b444149238b77ceae335ca20e7b4a (diff) | |
parent | a0e5ebdc1d16871222f9815f5066e4ca47e368fa (diff) | |
download | blackbird-op-linux-0b23e30b48b0b634fdc8c8198ea9dfec8c091968.tar.gz blackbird-op-linux-0b23e30b48b0b634fdc8c8198ea9dfec8c091968.zip |
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
-rw-r--r-- | Documentation/scheduler/00-INDEX | 2 | ||||
-rw-r--r-- | kernel/sched_debug.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/scheduler/00-INDEX b/Documentation/scheduler/00-INDEX index fc234d093fbf..aabcc3a089ba 100644 --- a/Documentation/scheduler/00-INDEX +++ b/Documentation/scheduler/00-INDEX @@ -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 diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c index ad958c1ec708..5ae17762ec32 100644 --- a/kernel/sched_debug.c +++ b/kernel/sched_debug.c @@ -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; |