From: Oleg Drokin <green@namesys.com>
To: Jeff Dike <jdike@karaya.com>
Cc: user-mode-linux-devel@lists.sourceforge.net,
linux-kernel@vger.kernel.org
Subject: Re: uml-patch-2.5.42-1
Date: Tue, 15 Oct 2002 10:42:10 +0400 [thread overview]
Message-ID: <20021015104210.A1335@namesys.com> (raw)
In-Reply-To: <200210150058.TAA05520@ccure.karaya.com>
Hello!
On Mon, Oct 14, 2002 at 07:58:28PM -0500, Jeff Dike wrote:
> UML has been updated to 2.5.42 and UML 2.4.19-12. In non-numeric terms,
For some reason I now need this patch to make bk-current to compile
(with 2.5.42-1 patch from you applied, of course).
I do not claim this is correct fix, but at least it works for me ;)
===== drivers/char/random.c 1.24 vs edited =====
--- 1.24/drivers/char/random.c Mon Oct 7 18:38:26 2002
+++ edited/drivers/char/random.c Tue Oct 15 10:20:50 2002
@@ -738,7 +738,7 @@
__s32 delta, delta2, delta3;
int entropy = 0;
-#if defined (__i386__) || defined (__x86_64__)
+#if (defined (__i386__) || defined (__x86_64__)) && !defined (__arch_um__)
if (cpu_has_tsc) {
__u32 high;
rdtsc(time, high);
===== drivers/char/mem.c 1.23 vs edited =====
--- 1.23/drivers/char/mem.c Mon Aug 5 23:05:22 2002
+++ edited/drivers/char/mem.c Tue Oct 15 10:18:31 2002
@@ -132,6 +132,7 @@
{
unsigned long prot = pgprot_val(_prot);
+#if !defined(__arch_um__)
#if defined(__i386__) || defined(__x86_64__)
/* On PPro and successors, PCD alone doesn't always mean
uncached because of interactions with the MTRRs. PCD | PWT
@@ -152,7 +153,7 @@
else if (MMU_IS_040 || MMU_IS_060)
prot = (prot & _CACHEMASK040) | _PAGE_NOCACHE_S;
#endif
-
+#endif
return __pgprot(prot);
}
@@ -164,7 +165,7 @@
*/
static inline int noncached_address(unsigned long addr)
{
-#if defined(__i386__)
+#if defined(__i386__) && !defined(__arch_um__)
/*
* On the PPro and successors, the MTRRs are used to set
* memory types for physical addresses outside main memory,
next prev parent reply other threads:[~2002-10-15 6:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-10-15 0:58 uml-patch-2.5.42-1 Jeff Dike
2002-10-15 6:42 ` Oleg Drokin [this message]
2002-10-15 7:25 ` [uml-devel] uml-patch-2.5.42-1 Mike Anderson
2002-10-15 13:52 ` uml-patch-2.5.42-1 Jeff Dike
2002-10-15 13:05 ` uml-patch-2.5.42-1 Oleg Drokin
2002-10-15 14:00 ` [uml-devel] uml-patch-2.5.42-1 Mike Anderson
2002-10-15 15:51 ` Jeff Dike
2002-10-15 12:00 ` uml-patch-2.5.42-1 Oleg Drokin
2002-10-15 16:25 ` uml-patch-2.5.42-1 Jeff Dike
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=20021015104210.A1335@namesys.com \
--to=green@namesys.com \
--cc=jdike@karaya.com \
--cc=linux-kernel@vger.kernel.org \
--cc=user-mode-linux-devel@lists.sourceforge.net \
/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;
as well as URLs for NNTP newsgroup(s).