diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 04:20:04 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 04:20:04 +0200 |
| commit | b4fe19f78e84813e720d0f0482da22194a7728e3 (patch) | |
| tree | 3b38d2b50bfc44e284ed8cc361a7d6b1398bd4fc /arch/arm64/kernel/sys_compat.c | |
| parent | Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming (diff) | |
| parent | Merge tag 'disintegrate-arm64-20121011' of git://git.infradead.org/users/dhow... (diff) | |
| download | linux-b4fe19f78e84813e720d0f0482da22194a7728e3.tar.xz linux-b4fe19f78e84813e720d0f0482da22194a7728e3.zip | |
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/sys_compat.c')
| -rw-r--r-- | arch/arm64/kernel/sys_compat.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm64/kernel/sys_compat.c b/arch/arm64/kernel/sys_compat.c index e521087cb0c4..906e3bd270b0 100644 --- a/arch/arm64/kernel/sys_compat.c +++ b/arch/arm64/kernel/sys_compat.c @@ -18,8 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define __SYSCALL_COMPAT - #include <linux/compat.h> #include <linux/personality.h> #include <linux/sched.h> @@ -28,7 +26,7 @@ #include <linux/uaccess.h> #include <asm/cacheflush.h> -#include <asm/unistd.h> +#include <asm/unistd32.h> asmlinkage int compat_sys_fork(struct pt_regs *regs) { |