From: "Tvrtko A. Uršulin" <tvrtko@croadria.com>
To: Tim Schmielau <tim@physik3.uni-rostock.de>,
Con Kolivas <kernel@kolivas.org>
Cc: linux kernel mailing list <linux-kernel@vger.kernel.org>
Subject: Re: 2.4.23-ck1
Date: Thu, 4 Dec 2003 14:36:57 +0100 [thread overview]
Message-ID: <200312041436.57450.tvrtko@croadria.com> (raw)
In-Reply-To: <Pine.LNX.4.53.0312041421300.9854@gockel.physik3.uni-rostock.de>
On Thursday 04 December 2003 14:31, Tim Schmielau wrote:
> Warning: totally untested. Pretty much obvious, however.
oxygene:/usr/src/linux-2.4.23-ck1 # patch --dry-run
<../patches/2.4.23-ck1-stat-fix.patch -p1 --global-reject=bla
patching file fs/proc/proc_misc.c
Hunk #1 FAILED at 422.
Hunk #2 FAILED at 460.
2 out of 2 hunks FAILED -- saving rejects to file fs/proc/proc_misc.c.rej
oxygene:/usr/src/linux-2.4.23-ck1 # cat bla
*************** fs/proc/proc_misc.c
*** 422,428 ****
(unsigned long long) jiffies_64_to_clock_t(user),
(unsigned long long) jiffies_64_to_clock_t(nice),
(unsigned long long) jiffies_64_to_clock_t(system),
- (unsigned long long) jiffies_64_to_clock_t(jif - user
-
nice - system));
}
proc_sprintf(page, &off, &len,
"page %u %u\n"
--- 422,428 ----
(unsigned long long) jiffies_64_to_clock_t(user),
(unsigned long long) jiffies_64_to_clock_t(nice),
(unsigned long long) jiffies_64_to_clock_t(system),
+ (unsigned long long) jif - jiffies_64_to_clock_t(user
+
nice + system));
}
proc_sprintf(page, &off, &len,
"page %u %u\n"
*************** fs/proc/proc_misc.c
*** 460,466 ****
}
}
- do_div(jif, HZ);
proc_sprintf(page, &off, &len,
"\nctxt %lu\n"
"btime %lu\n"
--- 460,466 ----
}
}
+ do_div(jif, USER_HZ);
proc_sprintf(page, &off, &len,
"\nctxt %lu\n"
"btime %lu\n"
> Sorry,
> Tim
>
>
> --- linux-2.4.23-ck1/fs/proc/proc_misc.c 2003-12-04 14:15:59.000000000
> +0100 +++ linux-2.4.23-ck1-fix/fs/proc/proc_misc.c 2003-12-04
> 14:20:07.000000000 +0100 @@ -422,7 +422,7 @@
> (unsigned long long) jiffies_64_to_clock_t(user),
> (unsigned long long) jiffies_64_to_clock_t(nice),
> (unsigned long long) jiffies_64_to_clock_t(system),
> - (unsigned long long) jiffies_64_to_clock_t(jif - user - nice -
> system)); + (unsigned long long) jif - jiffies_64_to_clock_t(user + nice
> + system)); }
> proc_sprintf(page, &off, &len,
> "page %u %u\n"
> @@ -460,7 +460,7 @@
> }
> }
>
> - do_div(jif, HZ);
> + do_div(jif, USER_HZ);
> proc_sprintf(page, &off, &len,
> "\nctxt %lu\n"
> "btime %lu\n"
next prev parent reply other threads:[~2003-12-04 13:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-12-03 15:28 2.4.23-ck1 Con Kolivas
2003-12-03 17:24 ` 2.4.23-ck1 Norberto Bensa
2003-12-03 17:46 ` 2.4.23-ck1 Marius Ascheberg
2003-12-03 19:01 ` 2.4.23-ck1 wwp
2003-12-03 19:15 ` 2.4.23-ck1 Josh McKinney
2003-12-03 22:26 ` 2.4.23-ck1 Con Kolivas
2003-12-04 10:43 ` 2.4.23-ck1 Tvrtko A. Uršulin
2003-12-04 12:21 ` 2.4.23-ck1 Con Kolivas
2003-12-04 13:31 ` 2.4.23-ck1 Tim Schmielau
2003-12-04 13:36 ` Tvrtko A. Uršulin [this message]
2003-12-04 14:08 ` 2.4.23-ck1 Con Kolivas
2003-12-04 14:37 ` 2.4.23-ck1 Guillermo Menguez Alvarez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200312041436.57450.tvrtko@croadria.com \
--to=tvrtko@croadria.com \
--cc=kernel@kolivas.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tim@physik3.uni-rostock.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox