lkml.org 
[lkml]   [2009]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[RFC v2][PATCH 16/35] sh: create ptemap.h
    From
    Date


    Signed-off-by: Dave Hansen <dave@linux.vnet.ibm.com>
    ---

    linux-2.6.git-dave/arch/sh/include/asm/pgtable_32.h | 6 +-----
    linux-2.6.git-dave/arch/sh/include/asm/pgtable_64.h | 5 +----
    linux-2.6.git-dave/arch/sh/include/asm/ptemap.h | 9 +++++++++
    3 files changed, 11 insertions(+), 9 deletions(-)

    diff -puN arch/sh/include/asm/pgtable_32.h~sh-ptemaph arch/sh/include/asm/pgtable_32.h
    --- linux-2.6.git/arch/sh/include/asm/pgtable_32.h~sh-ptemaph 2009-04-30 15:11:01.000000000 -0700
    +++ linux-2.6.git-dave/arch/sh/include/asm/pgtable_32.h 2009-04-30 15:11:01.000000000 -0700
    @@ -403,11 +403,7 @@ static inline pte_t pte_modify(pte_t pte
    #define pte_index(address) ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
    #define pte_offset_kernel(dir, address) \
    ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(address))
    -#define pte_offset_map(dir, address) pte_offset_kernel(dir, address)
    -#define pte_offset_map_nested(dir, address) pte_offset_kernel(dir, address)
    -
    -#define pte_unmap(pte) do { } while (0)
    -#define pte_unmap_nested(pte) do { } while (0)
    +#include <asm/ptemap.h>

    #ifdef CONFIG_X2TLB
    #define pte_ERROR(e) \
    diff -puN arch/sh/include/asm/pgtable_64.h~sh-ptemaph arch/sh/include/asm/pgtable_64.h
    --- linux-2.6.git/arch/sh/include/asm/pgtable_64.h~sh-ptemaph 2009-04-30 15:11:01.000000000 -0700
    +++ linux-2.6.git-dave/arch/sh/include/asm/pgtable_64.h 2009-04-30 15:11:01.000000000 -0700
    @@ -83,10 +83,7 @@ static __inline__ void pmd_set(pmd_t *pm
    #define pte_offset_kernel(dir, addr) \
    ((pte_t *) ((pmd_val(*(dir))) & PAGE_MASK) + pte_index((addr)))

    -#define pte_offset_map(dir,addr) pte_offset_kernel(dir, addr)
    -#define pte_offset_map_nested(dir,addr) pte_offset_kernel(dir, addr)
    -#define pte_unmap(pte) do { } while (0)
    -#define pte_unmap_nested(pte) do { } while (0)
    +#include <asm/ptemap.h>

    #ifndef __ASSEMBLY__
    #define IOBASE_VADDR 0xff000000
    diff -puN /dev/null arch/sh/include/asm/ptemap.h
    --- /dev/null 2008-09-02 09:40:19.000000000 -0700
    +++ linux-2.6.git-dave/arch/sh/include/asm/ptemap.h 2009-04-30 15:11:01.000000000 -0700
    @@ -0,0 +1,9 @@
    +#ifndef _SH_ASM_PTEMAP_H
    +#define _SH_ASM_PTEMAP_H
    +
    +#define pte_offset_map(dir, address) pte_offset_kernel(dir, address)
    +#define pte_offset_map_nested(dir, address) pte_offset_kernel(dir, address)
    +#define pte_unmap(pte) do { } while (0)
    +#define pte_unmap_nested(pte) do { } while (0)
    +
    +#endif /* _SH_ASM_PTEMAP_H */
    _

    \
     
     \ /
      Last update: 2009-05-20 20:39    [W:0.047 / U:33.172 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site