diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 23:59:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 23:59:27 -0800 |
| commit | 25aa595a676f130148eba073cdd5a8d57e9d238f (patch) | |
| tree | dc7925c1ea7bd0f65d483dd024e6cd7c4215dea7 /fs/proc/array.c | |
| parent | 6533333c8946e70120cc9d7fcad01e0f748d7863 (diff) | |
v2.5.1.2 -> v2.5.1.3
- Christoph Hellwig: scsi_register_module cleanup
- Mikael Pettersson: apic.c LVTERR fixes
- Russell King: ARM update (including bio update for icside)
- Jens Axboe: more bio updates
- Al Viro: make ready to switch bread away from kdev_t..
- Davide Libenzi: scheduler cleanups
- Anders Gustafsson: LVM fixes for bio
- Richard Gooch: devfs update
Diffstat (limited to 'fs/proc/array.c')
| -rw-r--r-- | fs/proc/array.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index d8738e51bb0f..5be5492c5e9a 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -335,8 +335,7 @@ int proc_pid_stat(struct task_struct *task, char * buffer) /* scale priority and nice values from timeslices to -20..20 */ /* to make it look like a "normal" Unix priority/nice value */ - priority = task->counter; - priority = 20 - (priority * 10 + DEF_COUNTER / 2) / DEF_COUNTER; + priority = task->dyn_prio; nice = task->nice; read_lock(&tasklist_lock); |