Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6ce7114 authored by Mark Salter's avatar Mark Salter Committed by Linus Torvalds
Browse files

um: use generic fixmap.h 



Signed-off-by: default avatarMark Salter <msalter@redhat.com>
Acked-by: default avatarRichard Weinberger <richard@nod.at>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8b49233f

arch/um/include/asm/fixmap.h

+1 −39
Original line number Diff line number Diff line
@@ -43,13 +43,6 @@ enum fixed_addresses { 
extern void __set_fixmap (enum fixed_addresses idx,

			  unsigned long phys, pgprot_t flags);



#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)

/*

 * used by vmalloc.c.

 *
@@ -62,37 +55,6 @@ extern void __set_fixmap (enum fixed_addresses idx, 
#define FIXADDR_SIZE	(__end_of_fixed_addresses << PAGE_SHIFT)

#define FIXADDR_START	(FIXADDR_TOP - FIXADDR_SIZE)



#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 tranlation, we catch the bug with a NULL-deference

 * kernel oops. Illegal ranges of incoming indices are caught too.

 */

static 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);

}

#include <asm-generic/fixmap.h>



#endif