diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-04-11 23:08:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-11 23:08:32 -0700 |
| commit | 8398bcc6b3eb950a1242f6dc4cfb151b6b9238c3 (patch) | |
| tree | d5f9dcd538db0655e94e528dc5f1acc1b4f5011a /kernel | |
| parent | b931abdbe485f7471f7b6d23d4123610cb8b558c (diff) | |
[PATCH] eliminate nswap and cnswap
From: Matt Mackall <mpm@selenic.com>
The nswap and cnswap variables counters have never been incremented as
Linux doesn't do task swapping.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/acct.c | 2 | ||||
| -rw-r--r-- | kernel/exit.c | 1 | ||||
| -rw-r--r-- | kernel/fork.c | 1 | ||||
| -rw-r--r-- | kernel/sys.c | 3 |
4 files changed, 1 insertions, 6 deletions
diff --git a/kernel/acct.c b/kernel/acct.c index b417066778a7..8e32413c41f3 100644 --- a/kernel/acct.c +++ b/kernel/acct.c @@ -376,7 +376,7 @@ static void do_acct_process(long exitcode, struct file *file) ac.ac_rw = encode_comp_t(ac.ac_io / 1024); ac.ac_minflt = encode_comp_t(current->min_flt); ac.ac_majflt = encode_comp_t(current->maj_flt); - ac.ac_swaps = encode_comp_t(current->nswap); + ac.ac_swaps = encode_comp_t(0); ac.ac_exitcode = exitcode; /* diff --git a/kernel/exit.c b/kernel/exit.c index 810eebd77559..8157dbc037d6 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -92,7 +92,6 @@ repeat: p->parent->cstime += p->stime + p->cstime; p->parent->cmin_flt += p->min_flt + p->cmin_flt; p->parent->cmaj_flt += p->maj_flt + p->cmaj_flt; - p->parent->cnswap += p->nswap + p->cnswap; p->parent->cnvcsw += p->nvcsw + p->cnvcsw; p->parent->cnivcsw += p->nivcsw + p->cnivcsw; sched_exit(p); diff --git a/kernel/fork.c b/kernel/fork.c index 315a06125e65..da5213611496 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -513,7 +513,6 @@ static int copy_mm(unsigned long clone_flags, struct task_struct * tsk) tsk->min_flt = tsk->maj_flt = 0; tsk->cmin_flt = tsk->cmaj_flt = 0; - tsk->nswap = tsk->cnswap = 0; tsk->nvcsw = tsk->nivcsw = tsk->cnvcsw = tsk->cnivcsw = 0; tsk->mm = NULL; diff --git a/kernel/sys.c b/kernel/sys.c index 9d57482758f3..4d414d925889 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1532,7 +1532,6 @@ int getrusage(struct task_struct *p, int who, struct rusage __user *ru) r.ru_nivcsw = p->nivcsw; r.ru_minflt = p->min_flt; r.ru_majflt = p->maj_flt; - r.ru_nswap = p->nswap; break; case RUSAGE_CHILDREN: jiffies_to_timeval(p->cutime, &r.ru_utime); @@ -1541,7 +1540,6 @@ int getrusage(struct task_struct *p, int who, struct rusage __user *ru) r.ru_nivcsw = p->cnivcsw; r.ru_minflt = p->cmin_flt; r.ru_majflt = p->cmaj_flt; - r.ru_nswap = p->cnswap; break; default: jiffies_to_timeval(p->utime + p->cutime, &r.ru_utime); @@ -1550,7 +1548,6 @@ int getrusage(struct task_struct *p, int who, struct rusage __user *ru) r.ru_nivcsw = p->nivcsw + p->cnivcsw; r.ru_minflt = p->min_flt + p->cmin_flt; r.ru_majflt = p->maj_flt + p->cmaj_flt; - r.ru_nswap = p->nswap + p->cnswap; break; } return copy_to_user(ru, &r, sizeof(r)) ? -EFAULT : 0; |