Merge "Merge android-5.4-stable.32 (724ffa0) into msm-5.4"

This commit is contained in:
qctecmdr 2020-06-25 14:38:29 -07:00 • committed by Gerrit - the friendly Code Review server
commit 1f2a0ad6f9
161 changed files with 87883 additions and 86055 deletions

View file

@ -321,6 +321,9 @@ struct incfs_get_filled_blocks_args {
/* Actual number of blocks in file */
__u32 total_blocks_out;
/* The number of data blocks in file */
__u32 data_blocks_out;
/* Number of bytes written to range buffer */
__u32 range_buffer_size_out;

View file

@ -4,6 +4,7 @@
#include <linux/types.h>
#include <linux/compiler.h>
#include <asm/bitsperlong.h>
#include <asm/swab.h>
/*
@ -132,6 +133,15 @@ static inline __attribute_const__ __u32 __fswahb32(__u32 val)
__fswab64(x))
#endif
static __always_inline unsigned long __swab(const unsigned long y)
{
#if __BITS_PER_LONG == 64
return __swab64(y);
#else /* __BITS_PER_LONG == 32 */
return __swab32(y);
#endif
}
/**
* __swahw32 - return a word-swapped 32-bit value
* @x: value to wordswap