diff options
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/kernel/irixelf.c | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/process.c | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/time.c | 8 | ||||
| -rw-r--r-- | arch/mips/tools/offset.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c index ee22aec9d..db8bb8698 100644 --- a/arch/mips/kernel/irixelf.c +++ b/arch/mips/kernel/irixelf.c @@ -1156,7 +1156,7 @@ static int irix_core_dump(long signr, struct pt_regs * regs, struct file *file) psinfo.pr_state = i; psinfo.pr_sname = (i < 0 || i > 5) ? '.' : "RSDZTD"[i]; psinfo.pr_zomb = psinfo.pr_sname == 'Z'; - psinfo.pr_nice = current->priority-15; + psinfo.pr_nice = current->nice; psinfo.pr_flag = current->flags; psinfo.pr_uid = current->uid; psinfo.pr_gid = current->gid; diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index 2353515b9..a5a630769 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -34,7 +34,7 @@ void cpu_idle(void) { /* endless idle loop with no priority at all */ - current->priority = 0; + current->nice = 20; current->counter = -100; init_idle(); diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 8de389a50..43a9c9a8e 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -25,7 +25,7 @@ #include <linux/mc146818rtc.h> #include <linux/timex.h> -extern volatile unsigned long lost_ticks; +extern volatile unsigned long wall_jiffies; unsigned long r4k_interval = 0; extern rwlock_t xtime_lock; @@ -226,10 +226,10 @@ void do_gettimeofday(struct timeval *tv) tv->tv_usec += do_gettimeoffset(); /* - * xtime is atomically updated in timer_bh. lost_ticks is - * nonzero if the timer bottom half hasnt executed yet. + * xtime is atomically updated in timer_bh. jiffies - wall_jiffies + * is nonzero if the timer bottom half hasnt executed yet. */ - if (lost_ticks) + if (jiffies - wall_jiffies) tv->tv_usec += USECS_PER_JIFFY; read_unlock_irqrestore (&xtime_lock, flags); diff --git a/arch/mips/tools/offset.c b/arch/mips/tools/offset.c index b76281d64..2e2af434e 100644 --- a/arch/mips/tools/offset.c +++ b/arch/mips/tools/offset.c @@ -81,7 +81,7 @@ void output_task_defines(void) offset("#define TASK_SIGPENDING ", struct task_struct, sigpending); offset("#define TASK_NEED_RESCHED ", struct task_struct, need_resched); offset("#define TASK_COUNTER ", struct task_struct, counter); - offset("#define TASK_PRIORITY ", struct task_struct, priority); + offset("#define TASK_NICE ", struct task_struct, nice); offset("#define TASK_MM ", struct task_struct, mm); size("#define TASK_STRUCT_SIZE ", struct task_struct); linefeed; |