diff options
| author | Greg KH <greg@press.(none)> | 2005-06-28 01:07:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-28 01:07:56 -0400 |
| commit | 8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (patch) | |
| tree | c43b6c2fdf1b68b66906a2de69446dcec0f9af6b /kernel/sched.c | |
| parent | 1cde8a16815bd85c8137d1ea556398983c597c11 (diff) | |
| parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index a07cff90d849..e2b0d3e4dd06 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -3448,15 +3448,7 @@ int task_nice(const task_t *p) | |||
| 3448 | { | 3448 | { |
| 3449 | return TASK_NICE(p); | 3449 | return TASK_NICE(p); |
| 3450 | } | 3450 | } |
| 3451 | |||
| 3452 | /* | ||
| 3453 | * The only users of task_nice are binfmt_elf and binfmt_elf32. | ||
| 3454 | * binfmt_elf is no longer modular, but binfmt_elf32 still is. | ||
| 3455 | * Therefore, task_nice is needed if there is a compat_mode. | ||
| 3456 | */ | ||
| 3457 | #ifdef CONFIG_COMPAT | ||
| 3458 | EXPORT_SYMBOL_GPL(task_nice); | 3451 | EXPORT_SYMBOL_GPL(task_nice); |
| 3459 | #endif | ||
| 3460 | 3452 | ||
| 3461 | /** | 3453 | /** |
| 3462 | * idle_cpu - is a given cpu idle currently? | 3454 | * idle_cpu - is a given cpu idle currently? |