lkml.org 
[lkml]   [2008]   [Jul]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] x86: make 64bit hpet_set_mapping to use ioremap too
    Date

    need to apply after
    [PATCH] x86: get x86_phys_bits early

    Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>

    diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
    index ea230ec..bfef53c 100644
    --- a/arch/x86/kernel/hpet.c
    +++ b/arch/x86/kernel/hpet.c
    @@ -35,24 +35,6 @@ static inline void hpet_writel(unsigned long d, unsigned long a)
    writel(d, hpet_virt_address + a);
    }

    -#ifdef CONFIG_X86_64
    -
    -#include <asm/pgtable.h>
    -
    -static inline void hpet_set_mapping(void)
    -{
    - set_fixmap_nocache(FIX_HPET_BASE, hpet_address);
    - __set_fixmap(VSYSCALL_HPET, hpet_address, PAGE_KERNEL_VSYSCALL_NOCACHE);
    - hpet_virt_address = (void __iomem *)fix_to_virt(FIX_HPET_BASE);
    -}
    -
    -static inline void hpet_clear_mapping(void)
    -{
    - hpet_virt_address = NULL;
    -}
    -
    -#else
    -
    static inline void hpet_set_mapping(void)
    {
    hpet_virt_address = ioremap_nocache(hpet_address, HPET_MMAP_SIZE);
    @@ -63,7 +45,6 @@ static inline void hpet_clear_mapping(void)
    iounmap(hpet_virt_address);
    hpet_virt_address = NULL;
    }
    -#endif

    /*
    * HPET command line enable / disable

    \
     
     \ /
      Last update: 2008-07-13 23:37    [W:0.020 / U:63.848 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site