lkml.org 
[lkml]   [2009]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] x86 headers: remove duplicate pud_large() definition
Ingo Molnar wrote:
> arch/x86/mach-voyager/voyager_smp.c
> arch/x86/mm/fault.c
>

I'm not sure where these two came from. I certainly didn't touch those
files; they must have diverged somewhere else along their history.

> and this in kmemcheck:
>
> Merge branch 'x86/headers' into kmemcheck
>
> Conflicts:
> arch/x86/include/asm/pgtable.h
>
> Merged into:
>
> arch/x86/include/asm/pgtable_types.h
>
> Plus the fixlet below.
>
> Ingo
>
> ------------------------->
> From 999c7880cc8eeb0cbe6610b8c6d0ab0ec51cd848 Mon Sep 17 00:00:00 2001
> From: Ingo Molnar <mingo@elte.hu>
> Date: Fri, 13 Feb 2009 13:15:55 +0100
> Subject: [PATCH] x86 headers: remove duplicate pud_large() definition
>
> Signed-off-by: Ingo Molnar <mingo@elte.hu>
> ---
> arch/x86/include/asm/pgtable.h | 7 -------
> 1 files changed, 0 insertions(+), 7 deletions(-)
>
> diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
> index 62024ff..1c097a3 100644
> --- a/arch/x86/include/asm/pgtable.h
> +++ b/arch/x86/include/asm/pgtable.h
> @@ -387,13 +387,6 @@ static inline unsigned long pages_to_mb(unsigned long npg)
> #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
> remap_pfn_range(vma, vaddr, pfn, size, prot)
>
> -#if PAGETABLE_LEVELS == 2
> -static inline int pud_large(pud_t pud)
> -{
> - return 0;
> -}
> -#endif
>

OK.

J


\
 
 \ /
  Last update: 2009-02-13 17:29    [from the cache]
©2003-2011 Jasper Spaans