lkml.org 
[lkml]   [2013]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 02/11] x86: use generic fixmap.h
    Date
    Signed-off-by: Mark Salter <msalter@redhat.com>
    CC: Thomas Gleixner <tglx@linutronix.de>
    CC: Ingo Molnar <mingo@redhat.com>
    CC: "H. Peter Anvin" <hpa@zytor.com>
    CC: x86@kernel.org
    ---
    arch/x86/include/asm/fixmap.h | 59 +------------------------------------------
    1 file changed, 1 insertion(+), 58 deletions(-)

    diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
    index e846225..7252cd3 100644
    --- a/arch/x86/include/asm/fixmap.h
    +++ b/arch/x86/include/asm/fixmap.h
    @@ -175,64 +175,7 @@ static inline void __set_fixmap(enum fixed_addresses idx,
    }
    #endif

    -#define set_fixmap(idx, phys) \
    - __set_fixmap(idx, phys, PAGE_KERNEL)
    -
    -/*
    - * Some hardware wants to get fixmapped without caching.
    - */
    -#define set_fixmap_nocache(idx, phys) \
    - __set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)
    -
    -#define clear_fixmap(idx) \
    - __set_fixmap(idx, 0, __pgprot(0))
    -
    -#define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT))
    -#define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)
    -
    -extern void __this_fixmap_does_not_exist(void);
    -
    -/*
    - * 'index to address' translation. If anyone tries to use the idx
    - * directly without translation, we catch the bug with a NULL-deference
    - * kernel oops. Illegal ranges of incoming indices are caught too.
    - */
    -static __always_inline unsigned long fix_to_virt(const unsigned int idx)
    -{
    - /*
    - * this branch gets completely eliminated after inlining,
    - * except when someone tries to use fixaddr indices in an
    - * illegal way. (such as mixing up address types or using
    - * out-of-range indices).
    - *
    - * If it doesn't get removed, the linker will complain
    - * loudly with a reasonably clear error message..
    - */
    - if (idx >= __end_of_fixed_addresses)
    - __this_fixmap_does_not_exist();
    -
    - return __fix_to_virt(idx);
    -}
    -
    -static inline unsigned long virt_to_fix(const unsigned long vaddr)
    -{
    - BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START);
    - return __virt_to_fix(vaddr);
    -}
    -
    -/* Return an pointer with offset calculated */
    -static __always_inline unsigned long
    -__set_fixmap_offset(enum fixed_addresses idx, phys_addr_t phys, pgprot_t flags)
    -{
    - __set_fixmap(idx, phys, flags);
    - return fix_to_virt(idx) + (phys & (PAGE_SIZE - 1));
    -}
    -
    -#define set_fixmap_offset(idx, phys) \
    - __set_fixmap_offset(idx, phys, PAGE_KERNEL)
    -
    -#define set_fixmap_offset_nocache(idx, phys) \
    - __set_fixmap_offset(idx, phys, PAGE_KERNEL_NOCACHE)
    +#include <asm-generic/fixmap.h>

    #endif /* !__ASSEMBLY__ */
    #endif /* _ASM_X86_FIXMAP_H */
    --
    1.8.3.1


    \
     
     \ /
      Last update: 2013-11-25 18:21    [W:3.928 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site