Re: [PATCH 1/4] x86: unify asm-x86/fixmap*.h

From: Ingo Molnar
Date: Fri Jun 20 2008 - 09:36:43 EST



* Ingo Molnar <mingo@xxxxxxx> wrote:

> > Almost everything aside from the actual fixmap slot definitions is
> > common, so move it all into the common fixmap.h header.
>
> nice patches! I have created a new -tip topic for them:
> tip/x86/fixmap, and have added them there. (This topic will also be in
> auto-x86-next on the next integration run.)

found a build failure with:

http://redhat.com/~mingo/misc/config-Fri_Jun_20_15_27_37_CEST_2008.bad

arch/x86/mm/pgtable.c:280: warning: âenum fixed_addresses' declared inside parameter list
arch/x86/mm/pgtable.c:280: warning: its scope is only this definition or declaration, which is probably not what you want
arch/x86/mm/pgtable.c:280: error: parameter 1 (âidx') has incomplete type
arch/x86/mm/pgtable.c: In function â__native_set_fixmap':

due to:

7c7e6e07e2a7c0d2d96389f4f0540e44a80ecdaa is first bad commit
commit 7c7e6e07e2a7c0d2d96389f4f0540e44a80ecdaa
Author: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Date: Tue Jun 17 11:41:54 2008 -0700

x86: unify __set_fixmap

In both cases, I went with the 32-bit behaviour.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

fixed via the patch below.

Ingo

-------->
commit b7429b1637b78fb272d42851ba8edd97e2ab08b1
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Fri Jun 20 15:34:46 2008 +0200

x86: unify __set_fixmap, fix

fix build failure:

arch/x86/mm/pgtable.c:280: warning: âenum fixed_addressesâ declared inside parameter list
arch/x86/mm/pgtable.c:280: warning: its scope is only this definition or declaration, which is probably not what you want
arch/x86/mm/pgtable.c:280: error: parameter 1 (âidxâ) has incomplete type

Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
index 66535c1..45b99ac 100644
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
@@ -2,6 +2,7 @@
#include <asm/pgalloc.h>
#include <asm/pgtable.h>
#include <asm/tlb.h>
+#include <asm/fixmap.h>

pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
{
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/