Commit 9f2c2d6b authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Yury Norov
Browse files

bitops: Move aligned_byte_mask() to wordpart.h 



The bitops.h is for bit related operations. The aligned_byte_mask()
is about byte (or part of the machine word) operations, for which
we have a separate header, move the mentioned macro to wordpart.h
to consolidate similar operations.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarYury Norov <yury.norov@gmail.com>
parent fe708f91

include/linux/bitops.h

+0 −7
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ 


#include <uapi/linux/kernel.h>



/* Set bits in the first 'n' bytes when loaded from memory */

#ifdef __LITTLE_ENDIAN

#  define aligned_byte_mask(n) ((1UL << 8*(n))-1)

#else

#  define aligned_byte_mask(n) (~0xffUL << (BITS_PER_LONG - 8 - 8*(n)))

#endif



#define BITS_PER_TYPE(type)	(sizeof(type) * BITS_PER_BYTE)

#define BITS_TO_LONGS(nr)	__KERNEL_DIV_ROUND_UP(nr, BITS_PER_TYPE(long))

#define BITS_TO_U64(nr)		__KERNEL_DIV_ROUND_UP(nr, BITS_PER_TYPE(u64))

include/linux/wordpart.h

+7 −0
Original line number Diff line number Diff line
@@ -39,4 +39,11 @@ 
 */

#define REPEAT_BYTE(x)	((~0ul / 0xff) * (x))



/* Set bits in the first 'n' bytes when loaded from memory */

#ifdef __LITTLE_ENDIAN

#  define aligned_byte_mask(n) ((1UL << 8*(n))-1)

#else

#  define aligned_byte_mask(n) (~0xffUL << (BITS_PER_LONG - 8 - 8*(n)))

#endif



#endif // _LINUX_WORDPART_H

lib/usercopy.c

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <linux/fault-inject-usercopy.h>

#include <linux/instrumented.h>

#include <linux/uaccess.h>

#include <linux/wordpart.h>

#include <linux/nospec.h>



/* out-of-line parts */