diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2012-09-10 16:11:46 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-10-17 14:35:04 +0100 |
| commit | 59dc67b0cc35cd93c3f4869fdd0d6cfb2a26ecbc (patch) | |
| tree | fa47b1ad1c6f0688fd50c3bd5f573bb55a451730 /arch/arm64/kernel/entry.S | |
| parent | c34501d21b005a6e363386a19519bd11cf92a67c (diff) | |
| download | talos-op-linux-59dc67b0cc35cd93c3f4869fdd0d6cfb2a26ecbc.tar.gz talos-op-linux-59dc67b0cc35cd93c3f4869fdd0d6cfb2a26ecbc.zip | |
arm64: Use generic kernel_execve() implementation
This patch enables CONFIG_GENERIC_KERNEL_EXECVE on arm64 and removes the
arm64-specific implementation of kernel_execve().
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/kernel/entry.S')
| -rw-r--r-- | arch/arm64/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 08db8972ebcc..00daf922733e 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -594,7 +594,7 @@ work_resched: /* * "slow" syscall return path. */ -ENTRY(ret_to_user) +ret_to_user: disable_irq // disable interrupts ldr x1, [tsk, #TI_FLAGS] and x2, x1, #_TIF_WORK_MASK |
