x86: unify asm-x86/fixmap*.h (944256e0) · Commits · e / devices / android_kernel_teracube_emerald

include/asm-x86/fixmap.h

+43 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7,7 +7,50 @@
	# include "fixmap_64.h"		# include "fixmap_64.h"
	#endif		#endif

			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)

	#define clear_fixmap(idx) \		#define clear_fixmap(idx) \
	__set_fixmap(idx, 0, __pgprot(0))		__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);
			}
	#endif		#endif

include/asm-x86/fixmap_32.h

+0 −42

Original line number	Original line	Diff line number	Diff line
	@@ -109,17 +109,8 @@ enum fixed_addresses {
	__end_of_fixed_addresses		__end_of_fixed_addresses
	};		};

	extern void __set_fixmap(enum fixed_addresses idx,
	unsigned long phys, pgprot_t flags);
	extern void reserve_top_address(unsigned long reserve);		extern void reserve_top_address(unsigned long reserve);

	#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 FIXADDR_TOP ((unsigned long)__FIXADDR_TOP)		#define FIXADDR_TOP ((unsigned long)__FIXADDR_TOP)

	@@ -128,38 +119,5 @@ extern void reserve_top_address(unsigned long reserve);
	#define FIXADDR_START (FIXADDR_TOP - __FIXADDR_SIZE)		#define FIXADDR_START (FIXADDR_TOP - __FIXADDR_SIZE)
	#define FIXADDR_BOOT_START (FIXADDR_TOP - __FIXADDR_BOOT_SIZE)		#define FIXADDR_BOOT_START (FIXADDR_TOP - __FIXADDR_BOOT_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 __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);
	}

	#endif /* !__ASSEMBLY__ */		#endif /* !__ASSEMBLY__ */
	#endif		#endif

include/asm-x86/fixmap_64.h

+0 −37

Original line number	Original line	Diff line number	Diff line
	@@ -52,17 +52,6 @@ enum fixed_addresses {
	__end_of_fixed_addresses		__end_of_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)

	#define FIXADDR_TOP (VSYSCALL_END-PAGE_SIZE)		#define FIXADDR_TOP (VSYSCALL_END-PAGE_SIZE)
	#define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)		#define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)
	#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)		#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)
	@@ -71,30 +60,4 @@ extern void __set_fixmap(enum fixed_addresses idx,
	#define FIXADDR_USER_START ((unsigned long)VSYSCALL32_VSYSCALL)		#define FIXADDR_USER_START ((unsigned long)VSYSCALL32_VSYSCALL)
	#define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE)		#define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE)

	#define __fix_to_virt(x) (FIXADDR_TOP - ((x) << 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);
	}

	#endif		#endif