Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'driver-core-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull misc fixes from Greg KH:
"Here are three small fixes for 4.6-rc4.
Two fix up some lz4 issues with big endian systems, and the remaining
one resolves a minor debugfs issue that was reported.
All have been in linux-next with no reported issues"
* tag 'driver-core-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
lib: lz4: cleanup unaligned access efficiency detection
lib: lz4: fixed zram with lz4 on big endian machines
debugfs: Make automount point inodes permanently empty
+14
-13
+1
-1
fs/debugfs/inode.c
+1
-1
fs/debugfs/inode.c
+13
-12
lib/lz4/lz4defs.h
+13
-12
lib/lz4/lz4defs.h
···
11
11
/*
12
12
* Detects 64 bits mode
13
13
*/
14
-
#if (defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) \
15
-
|| defined(__ppc64__) || defined(__LP64__))
14
+
#if defined(CONFIG_64BIT)
16
15
#define LZ4_ARCH64 1
17
16
#else
18
17
#define LZ4_ARCH64 0
···
24
25
typedef struct _U16_S { u16 v; } U16_S;
25
26
typedef struct _U32_S { u32 v; } U32_S;
26
27
typedef struct _U64_S { u64 v; } U64_S;
27
-
#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) \
28
-
|| defined(CONFIG_ARM) && __LINUX_ARM_ARCH__ >= 6 \
29
-
&& defined(ARM_EFFICIENT_UNALIGNED_ACCESS)
28
+
#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)
30
29
31
30
#define A16(x) (((U16_S *)(x))->v)
32
31
#define A32(x) (((U32_S *)(x))->v)
···
32
35
33
36
#define PUT4(s, d) (A32(d) = A32(s))
34
37
#define PUT8(s, d) (A64(d) = A64(s))
38
+
39
+
#define LZ4_READ_LITTLEENDIAN_16(d, s, p) \
40
+
(d = s - A16(p))
41
+
35
42
#define LZ4_WRITE_LITTLEENDIAN_16(p, v) \
36
43
do { \
37
44
A16(p) = v; \
···
52
51
#define PUT8(s, d) \
53
52
put_unaligned(get_unaligned((const u64 *) s), (u64 *) d)
54
53
55
-
#define LZ4_WRITE_LITTLEENDIAN_16(p, v) \
56
-
do { \
57
-
put_unaligned(v, (u16 *)(p)); \
58
-
p += 2; \
54
+
#define LZ4_READ_LITTLEENDIAN_16(d, s, p) \
55
+
(d = s - get_unaligned_le16(p))
56
+
57
+
#define LZ4_WRITE_LITTLEENDIAN_16(p, v) \
58
+
do { \
59
+
put_unaligned_le16(v, (u16 *)(p)); \
60
+
p += 2; \
59
61
} while (0)
60
62
#endif
61
63
···
143
139
#endif
144
140
145
141
#endif
146
-
147
-
#define LZ4_READ_LITTLEENDIAN_16(d, s, p) \
148
-
(d = s - get_unaligned_le16(p))
149
142
150
143
#define LZ4_WILDCOPY(s, d, e) \
151
144
do { \