mirror of
https://github.com/torvalds/linux.git
synced 2024-11-17 01:22:07 +00:00
x86: use generic fixmap.h
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> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
d57c33c5da
commit
114cefc87e
@ -175,64 +175,7 @@ static inline void __set_fixmap(enum fixed_addresses idx,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define set_fixmap(idx, phys) \
|
#include <asm-generic/fixmap.h>
|
||||||
__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)
|
|
||||||
|
|
||||||
#endif /* !__ASSEMBLY__ */
|
#endif /* !__ASSEMBLY__ */
|
||||||
#endif /* _ASM_X86_FIXMAP_H */
|
#endif /* _ASM_X86_FIXMAP_H */
|
||||||
|
Loading…
Reference in New Issue
Block a user