diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-04 13:41:54 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-04 13:41:54 -0500 |
commit | 5f243b9b46a22e5790dbbc36f574c2417af49a41 (patch) | |
tree | 923c175213be85ae5b82f4d15db6230283756bf7 /arch/arm64 | |
parent | 6ed1914982e9cd46e37a6a6aa9e1fd1de6a50bf7 (diff) | |
parent | 25c92a37a8191b5fdbbba7bdc917e14766a52461 (diff) |
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
Diffstat (limited to 'arch/arm64')
-rw-r--r-- | arch/arm64/Kconfig | 6 | ||||
-rw-r--r-- | arch/arm64/include/asm/compat.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 9c829b008261..f8f362aafee9 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig | |||
@@ -2,6 +2,8 @@ config ARM64 | |||
2 | def_bool y | 2 | def_bool y |
3 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE | 3 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE |
4 | select ARCH_WANT_COMPAT_IPC_PARSE_VERSION | 4 | select ARCH_WANT_COMPAT_IPC_PARSE_VERSION |
5 | select ARM_AMBA | ||
6 | select CLONE_BACKWARDS | ||
5 | select COMMON_CLK | 7 | select COMMON_CLK |
6 | select GENERIC_CLOCKEVENTS | 8 | select GENERIC_CLOCKEVENTS |
7 | select GENERIC_HARDIRQS_NO_DEPRECATED | 9 | select GENERIC_HARDIRQS_NO_DEPRECATED |
@@ -31,7 +33,6 @@ config ARM64 | |||
31 | select RTC_LIB | 33 | select RTC_LIB |
32 | select SPARSE_IRQ | 34 | select SPARSE_IRQ |
33 | select SYSCTL_EXCEPTION_TRACE | 35 | select SYSCTL_EXCEPTION_TRACE |
34 | select CLONE_BACKWARDS | ||
35 | help | 36 | help |
36 | ARM 64-bit (AArch64) Linux support. | 37 | ARM 64-bit (AArch64) Linux support. |
37 | 38 | ||
@@ -90,6 +91,9 @@ config SWIOTLB | |||
90 | config IOMMU_HELPER | 91 | config IOMMU_HELPER |
91 | def_bool SWIOTLB | 92 | def_bool SWIOTLB |
92 | 93 | ||
94 | config GENERIC_GPIO | ||
95 | def_bool y | ||
96 | |||
93 | source "init/Kconfig" | 97 | source "init/Kconfig" |
94 | 98 | ||
95 | source "kernel/Kconfig.freezer" | 99 | source "kernel/Kconfig.freezer" |
diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index d9ec40217a27..618b450e5a1d 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h | |||
@@ -23,6 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | #include <linux/types.h> | 24 | #include <linux/types.h> |
25 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
26 | #include <linux/ptrace.h> | ||
26 | 27 | ||
27 | #define COMPAT_USER_HZ 100 | 28 | #define COMPAT_USER_HZ 100 |
28 | #define COMPAT_UTS_MACHINE "armv8l\0\0" | 29 | #define COMPAT_UTS_MACHINE "armv8l\0\0" |