- Missing include in asm/compat.h.
- Kconfig updates. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iQIcBAABAgAGBQJQ5vVfAAoJEGvWsS0AyF7xUq4P/12v8hr2fpdPJ7BMA7OCSZli kR+CKl0zl0g8Lzf5o6ruHO1ml6M+Q7cLgiOljxHikVnq53//MRKaTKpxVrhVR5/Y vzcHR+U7R0h7B34L4E5dD8KIeiHjYxIN9KF7oHjGSxvJg654r5Md1owgWIn6vasp t/Q0bSZHEosVkQlkFfydtSIzp79M/UPWGZiKjQSzKLEyOT92w6nphxfVSLmklDST qqWZUXBNXUEc95MEXqqc2VVejwtCww+qd+CvNXiLv4R5JTiD5UZTiSoG5C2hkEqO HMn7/fYyUWB0kEWN2wDPDGYosYLyyo5f+6peNVEMUfAKJQpLb4hSaaf5rAvMP7rT wg0vhFnLzl3ovwF0d+0hN7j2TN7yoYk/2rHmrqSdJqfra/KSf2WLEd9q+QtBxRi5 BGUDiaGQq0mrp6WmxsqH4dGiq2WIVEg5DLGnJ6SIrML/MIXRfH8D91H7pQvH3rga VcJR0f/ZPPQMOgR0djUlhQ2fctd9ouupKluioJzRtW8ATOTSWEvD2W735FoL8QCK f0TvF/0vNQ0I8OkX805kB/ArKRJN5AZYvQsZxWiAkUv7/AFOvAqjwl0+ks5vqqyJ klXgvlZtgiO+/3bJ5fGsX9vOyQ0DaIxXVOsLwa2L5Fi2uBpwVYaZUuKT1yGqNGop 6PxnDy/7sZlPAqUqKIVe =05eO -----END PGP SIGNATURE----- Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 Pull ARM64 fixes from Catalin Marinas: - Missing include in asm/compat.h. - Kconfig updates. * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: arm64: Always select ARM_AMBA and GENERIC_GPIO arm64: Keep the ARM64 Kconfig selects sorted arm64: Include linux/ptrace.h in asm/compat.h
This commit is contained in:
commit
5f243b9b46
|
@ -2,6 +2,8 @@ config ARM64
|
||||||
def_bool y
|
def_bool y
|
||||||
select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
|
select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
|
||||||
select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
|
select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
|
||||||
|
select ARM_AMBA
|
||||||
|
select CLONE_BACKWARDS
|
||||||
select COMMON_CLK
|
select COMMON_CLK
|
||||||
select GENERIC_CLOCKEVENTS
|
select GENERIC_CLOCKEVENTS
|
||||||
select GENERIC_HARDIRQS_NO_DEPRECATED
|
select GENERIC_HARDIRQS_NO_DEPRECATED
|
||||||
|
@ -31,7 +33,6 @@ config ARM64
|
||||||
select RTC_LIB
|
select RTC_LIB
|
||||||
select SPARSE_IRQ
|
select SPARSE_IRQ
|
||||||
select SYSCTL_EXCEPTION_TRACE
|
select SYSCTL_EXCEPTION_TRACE
|
||||||
select CLONE_BACKWARDS
|
|
||||||
help
|
help
|
||||||
ARM 64-bit (AArch64) Linux support.
|
ARM 64-bit (AArch64) Linux support.
|
||||||
|
|
||||||
|
@ -90,6 +91,9 @@ config SWIOTLB
|
||||||
config IOMMU_HELPER
|
config IOMMU_HELPER
|
||||||
def_bool SWIOTLB
|
def_bool SWIOTLB
|
||||||
|
|
||||||
|
config GENERIC_GPIO
|
||||||
|
def_bool y
|
||||||
|
|
||||||
source "init/Kconfig"
|
source "init/Kconfig"
|
||||||
|
|
||||||
source "kernel/Kconfig.freezer"
|
source "kernel/Kconfig.freezer"
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
*/
|
*/
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
|
#include <linux/ptrace.h>
|
||||||
|
|
||||||
#define COMPAT_USER_HZ 100
|
#define COMPAT_USER_HZ 100
|
||||||
#define COMPAT_UTS_MACHINE "armv8l\0\0"
|
#define COMPAT_UTS_MACHINE "armv8l\0\0"
|
||||||
|
|
Loading…
Reference in a new issue