On Thu, 2009-01-29 at 00:04 +0100, Andrea Righi wrote:
> Also unify implementations of pmd_*() functions in arch/*.
>
> This patch must be applied on top of mm-unify-some-pmd_-functions.patch.
>
> Signed-off-by: Andrea Righi <righi.andrea@xxxxxxxxx>
> diff --git a/arch/s390/include/asm/pgalloc.h b/arch/s390/include/asm/pgalloc.h
> index b2658b9..6a85281 100644
> --- a/arch/s390/include/asm/pgalloc.h
> +++ b/arch/s390/include/asm/pgalloc.h
> @@ -63,8 +63,7 @@ static inline unsigned long pgd_entry_type(struct mm_struct *mm)
> #define pud_alloc_one(mm,address) ({ BUG(); ((pud_t *)2); })
> #define pud_free(mm, x) do { } while (0)
>
> -#define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); })
> -#define pmd_free(mm, x) do { } while (0)
> +#define pmd_alloc_one pmd_alloc_one_bug
>
> #define pgd_populate(mm, pgd, pud) BUG()
> #define pgd_populate_kernel(mm, pgd, pud) BUG()
This does not compile for 32 bit s390. With the patches for 'dynamic
page tables' and '1K/2k page tables' I decided to get completely
independent from the nopmd/nopud #ifdef hell. The include files from
asm-generic are simply not used for s390. Please drop the above hunk
from your patch and leave s390 as it is.
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
--
To unsubscribe from this list: send the line "unsubscribe linux-arch" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
