Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
Pull ARM64 fixes/updates from Catalin Marinas:
- Bug-fixes (get_user/put_user, incorrect register width for ASID,
FPSIMD initialisation)
- Kconfig clean-up
- defconfig update
* tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
arm64: Remove duplicate DEBUG_STACK_USAGE config
arm64: include VIRTIO_{MMIO,BLK} in defconfig
arm64: include EXT4 in defconfig
arm64: fix possible invalid FPSIMD initialization state
arm64: use correct register width when retrieving ASID
arm64: avoid multiple evaluation of ptr in get_user/put_user()
+13
-13
-7
arch/arm64/Kconfig.debug
-7
arch/arm64/Kconfig.debug
···
6
6
bool
7
7
default y
8
8
9
-
config DEBUG_STACK_USAGE
10
-
bool "Enable stack utilization instrumentation"
11
-
depends on DEBUG_KERNEL
12
-
help
13
-
Enables the display of the minimum amount of free stack which each
14
-
task has ever had available in the sysrq-T output.
15
-
16
9
config EARLY_PRINTK
17
10
bool "Early printk support"
18
11
default y
+4
-1
arch/arm64/configs/defconfig
+4
-1
arch/arm64/configs/defconfig
···
42
42
# CONFIG_WIRELESS is not set
43
43
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
44
44
CONFIG_DEVTMPFS=y
45
-
# CONFIG_BLK_DEV is not set
45
+
CONFIG_BLK_DEV=y
46
46
CONFIG_SCSI=y
47
47
# CONFIG_SCSI_PROC_FS is not set
48
48
CONFIG_BLK_DEV_SD=y
···
72
72
# CONFIG_IOMMU_SUPPORT is not set
73
73
CONFIG_EXT2_FS=y
74
74
CONFIG_EXT3_FS=y
75
+
CONFIG_EXT4_FS=y
75
76
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
76
77
# CONFIG_EXT3_FS_XATTR is not set
77
78
CONFIG_FUSE_FS=y
···
91
90
CONFIG_DEBUG_INFO=y
92
91
# CONFIG_FTRACE is not set
93
92
CONFIG_ATOMIC64_SELFTEST=y
93
+
CONFIG_VIRTIO_MMIO=y
94
+
CONFIG_VIRTIO_BLK=y
+6
-4
arch/arm64/include/asm/uaccess.h
+6
-4
arch/arm64/include/asm/uaccess.h
···
166
166
167
167
#define get_user(x, ptr) \
168
168
({ \
169
+
__typeof__(*(ptr)) __user *__p = (ptr); \
169
170
might_fault(); \
170
-
access_ok(VERIFY_READ, (ptr), sizeof(*(ptr))) ? \
171
-
__get_user((x), (ptr)) : \
171
+
access_ok(VERIFY_READ, __p, sizeof(*__p)) ? \
172
+
__get_user((x), __p) : \
172
173
((x) = 0, -EFAULT); \
173
174
})
174
175
···
228
227
229
228
#define put_user(x, ptr) \
230
229
({ \
230
+
__typeof__(*(ptr)) __user *__p = (ptr); \
231
231
might_fault(); \
232
-
access_ok(VERIFY_WRITE, (ptr), sizeof(*(ptr))) ? \
233
-
__put_user((x), (ptr)) : \
232
+
access_ok(VERIFY_WRITE, __p, sizeof(*__p)) ? \
233
+
__put_user((x), __p) : \
234
234
-EFAULT; \
235
235
})
236
236
+2
arch/arm64/kernel/fpsimd.c
+2
arch/arm64/kernel/fpsimd.c