From: Eric BEGOT <eric.begot@gmail.com>
To: Jeff Dike <jdike@addtoit.com>
Cc: Andrew Morton <akpm@osdl.org>,
linux-kernel@vger.kernel.org,
user-mode-linux-devel@lists.sourceforge.net
Subject: [uml-devel] [PATCH] UML - 2.6.12-rc4-mm2 Compile error
Date: Sun, 22 May 2005 21:47:18 +0200 [thread overview]
Message-ID: <4290E1C6.9070709@gmail.com> (raw)
In-Reply-To: <200505201436.j4KEZxjh006235@ccure.user-mode-linux.org>
Here is a patch to correct a compile error on linux 2.6.12-rc4-mm2 for uml.
At the compilation of init/main.c, it complains because it doens't find
the 2 constants FIXADDR_USER_START and FIXADDR_USER_END
--- linux-2.6.12-rc4-mm2/include/asm/fixmap.h.orig 2005-05-22
21:37:13.000000000 +0200
+++ linux-2.6.12-rc4-mm2/include/asm/fixmap.h 2005-05-22
21:38:17.000000000 +0200
@@ -60,7 +60,8 @@ extern unsigned long get_kmem_end(void);
#define FIXADDR_TOP (get_kmem_end() - 0x2000)
#define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)
-#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)
+#define FIXADDR_USER_START (FIXADDR_TOP - FIXADDR_SIZE)
+#define FIXADDR_USER_END FIXADDR_TOP
#define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT))
#define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)
@@ -91,7 +92,7 @@ static inline unsigned long fix_to_virt(
static inline unsigned long virt_to_fix(const unsigned long vaddr)
{
- BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START);
+ BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_USER_START);
return __virt_to_fix(vaddr);
}
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
WARNING: multiple messages have this Message-ID (diff)
From: Eric BEGOT <eric.begot@gmail.com>
To: Jeff Dike <jdike@addtoit.com>
Cc: Andrew Morton <akpm@osdl.org>,
linux-kernel@vger.kernel.org,
user-mode-linux-devel@lists.sourceforge.net
Subject: [PATCH] UML - 2.6.12-rc4-mm2 Compile error
Date: Sun, 22 May 2005 21:47:18 +0200 [thread overview]
Message-ID: <4290E1C6.9070709@gmail.com> (raw)
In-Reply-To: <200505201436.j4KEZxjh006235@ccure.user-mode-linux.org>
Here is a patch to correct a compile error on linux 2.6.12-rc4-mm2 for uml.
At the compilation of init/main.c, it complains because it doens't find
the 2 constants FIXADDR_USER_START and FIXADDR_USER_END
--- linux-2.6.12-rc4-mm2/include/asm/fixmap.h.orig 2005-05-22
21:37:13.000000000 +0200
+++ linux-2.6.12-rc4-mm2/include/asm/fixmap.h 2005-05-22
21:38:17.000000000 +0200
@@ -60,7 +60,8 @@ extern unsigned long get_kmem_end(void);
#define FIXADDR_TOP (get_kmem_end() - 0x2000)
#define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)
-#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)
+#define FIXADDR_USER_START (FIXADDR_TOP - FIXADDR_SIZE)
+#define FIXADDR_USER_END FIXADDR_TOP
#define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT))
#define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)
@@ -91,7 +92,7 @@ static inline unsigned long fix_to_virt(
static inline unsigned long virt_to_fix(const unsigned long vaddr)
{
- BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START);
+ BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_USER_START);
return __virt_to_fix(vaddr);
}
next prev parent reply other threads:[~2005-05-22 19:47 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20050518141800.299476d9.akpm@osdl.org>
2005-05-20 14:35 ` [uml-devel] Re: [PATCH 4/9] UML - Delay loop cleanups Jeff Dike
2005-05-20 14:35 ` Jeff Dike
2005-05-22 19:47 ` Eric BEGOT [this message]
2005-05-22 19:47 ` [PATCH] UML - 2.6.12-rc4-mm2 Compile error Eric BEGOT
2005-05-23 14:09 ` [uml-devel] " Blaisorblade
2005-05-23 14:09 ` Blaisorblade
2005-05-23 14:16 ` Miklos Szeredi
2005-05-23 14:16 ` Miklos Szeredi
2005-05-23 17:36 ` Blaisorblade
2005-05-23 17:36 ` Blaisorblade
2005-05-23 17:32 ` Blaisorblade
2005-05-23 17:32 ` Blaisorblade
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=4290E1C6.9070709@gmail.com \
--to=eric.begot@gmail.com \
--cc=akpm@osdl.org \
--cc=jdike@addtoit.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.