Commit 6d447125 authored by Vincent Mailhol's avatar Vincent Mailhol Committed by Yury Norov
Browse files

bits: split the definition of the asm and non-asm GENMASK*() 



In an upcoming change, the non-asm GENMASK*() will all be unified to
depend on GENMASK_TYPE() which indirectly depend on sizeof(), something
not available in asm.

Instead of adding further complexity to GENMASK_TYPE() to make it work
for both asm and non asm, just split the definition of the two variants.

Signed-off-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarYury Norov (NVIDIA) <yury.norov@gmail.com>
parent b0c85e99

include/linux/bits.h

+7 −6
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@ 


#define GENMASK_INPUT_CHECK(h, l) BUILD_BUG_ON_ZERO(const_true((l) > (h)))



#define GENMASK(h, l) \

	(GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))

#define GENMASK_ULL(h, l) \

	(GENMASK_INPUT_CHECK(h, l) + __GENMASK_ULL(h, l))



/*

 * Generate a mask for the specified type @t. Additional checks are made to

 * guarantee the value returned fits in that type, relying on
@@ -79,15 +84,11 @@ 
 * BUILD_BUG_ON_ZERO is not available in h files included from asm files,

 * disable the input check if that is the case.

 */

#define GENMASK_INPUT_CHECK(h, l) 0

#define GENMASK(h, l)		__GENMASK(h, l)

#define GENMASK_ULL(h, l)	__GENMASK_ULL(h, l)



#endif /* !defined(__ASSEMBLY__) */



#define GENMASK(h, l) \

	(GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))

#define GENMASK_ULL(h, l) \

	(GENMASK_INPUT_CHECK(h, l) + __GENMASK_ULL(h, l))



#if !defined(__ASSEMBLY__)

/*

 * Missing asm support