diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-04 10:41:54 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-04 10:41:54 -0800 |
commit | 5f243b9b46a22e5790dbbc36f574c2417af49a41 (patch) | |
tree | 923c175213be85ae5b82f4d15db6230283756bf7 /arch/arm64/include/asm/compat.h | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (diff) | |
parent | arm64: Always select ARM_AMBA and GENERIC_GPIO (diff) | |
download | linux-dev-5f243b9b46a22e5790dbbc36f574c2417af49a41.tar.xz linux-dev-5f243b9b46a22e5790dbbc36f574c2417af49a41.zip |
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/include/asm/compat.h')
-rw-r--r-- | arch/arm64/include/asm/compat.h | 1 |
1 files changed, 1 insertions, 0 deletions
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 @@ */ #include <linux/types.h> #include <linux/sched.h> +#include <linux/ptrace.h> #define COMPAT_USER_HZ 100 #define COMPAT_UTS_MACHINE "armv8l\0\0" |