diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 22:20:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 22:20:04 -0400 |
| commit | b4fe19f78e84813e720d0f0482da22194a7728e3 (patch) | |
| tree | 3b38d2b50bfc44e284ed8cc361a7d6b1398bd4fc /arch/arm64/kernel/entry.S | |
| parent | ff69497ad754b0fa9d5935df644890f208f31558 (diff) | |
| parent | 48b3b3215f6bc33986f275a0cff508bd9b23fd86 (diff) | |
Merge tag 'arm64-uapi' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
Pull arm64 uapi disintegration from Catalin Marinas:
"UAPI headers for arm64 together with some clean-up to make it
possible:
- Do not export the COMPAT_* definitions to user
- Simplify the compat unistd32.h definitions and remove the
__SYSCALL_COMPAT guard
- Disintegrate the arch/arm64/include/asm/* headers"
* tag 'arm64-uapi' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
UAPI: (Scripted) Disintegrate arch/arm64/include/asm
arm64: Do not export the compat-specific definitions to the user
arm64: Do not include asm/unistd32.h in asm/unistd.h
arm64: Remove unused definitions from asm/unistd32.h
Diffstat (limited to 'arch/arm64/kernel/entry.S')
| -rw-r--r-- | arch/arm64/kernel/entry.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 6538928ff1ab..a6f3f7da6880 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <asm/errno.h> | 26 | #include <asm/errno.h> |
| 27 | #include <asm/thread_info.h> | 27 | #include <asm/thread_info.h> |
| 28 | #include <asm/unistd.h> | 28 | #include <asm/unistd.h> |
| 29 | #include <asm/unistd32.h> | ||
| 29 | 30 | ||
| 30 | /* | 31 | /* |
| 31 | * Bad Abort numbers | 32 | * Bad Abort numbers |