Messages in this thread Patch in this message | | | From | Blaisorblade <> | Subject | Re: [uml-devel] [PATCH] UML - 2.6.12-rc4-mm2 Compile error | Date | Mon, 23 May 2005 16:09:47 +0200 |
| |
On Sunday 22 May 2005 21:47, Eric BEGOT wrote: > 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 Why deleting FIXADDR_START? Also FIXADDR_USER_* are defined, just in a different way (and the patch below is IIRC uncorrect). > > --- 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); > }
-- Paolo Giarrusso, aka Blaisorblade Skype user "PaoloGiarrusso" Linux registered user n. 292729 http://www.user-mode-linux.org/~blaisorblade
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |