From mboxrd@z Thu Jan 1 00:00:00 1970 From: Max Filippov Subject: [PATCH v2 3/4] xtensa: switch to generic kernel_execve() Date: Mon, 29 Oct 2012 18:56:20 +0400 Message-ID: <1351522581-30516-4-git-send-email-jcmvbkbc@gmail.com> References: <1351522581-30516-1-git-send-email-jcmvbkbc@gmail.com> Return-path: Received: from mail-la0-f46.google.com ([209.85.215.46]:47053 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752231Ab2J2O46 (ORCPT ); Mon, 29 Oct 2012 10:56:58 -0400 Received: by mail-la0-f46.google.com with SMTP id h6so3826596lag.19 for ; Mon, 29 Oct 2012 07:56:57 -0700 (PDT) In-Reply-To: <1351522581-30516-1-git-send-email-jcmvbkbc@gmail.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Al Viro Cc: linux-arch@vger.kernel.org, Chris Zankel , Marc Gauthier , Max Filippov Signed-off-by: Max Filippov --- arch/xtensa/Kconfig | 1 + arch/xtensa/kernel/entry.S | 18 +----------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 1033a1a..e957454 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -14,6 +14,7 @@ config XTENSA select MODULES_USE_ELF_RELA select GENERIC_PCI_IOMAP select GENERIC_KERNEL_THREAD + select GENERIC_KERNEL_EXECVE select ARCH_WANT_OPTIONAL_GPIOLIB select OF select OF_EARLY_FLATTREE diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S index 0fc994f..7da2c02 100644 --- a/arch/xtensa/kernel/entry.S +++ b/arch/xtensa/kernel/entry.S @@ -1833,22 +1833,6 @@ ENTRY(system_call) /* - * Do a system call from kernel instead of calling sys_execve, so we end up - * with proper pt_regs. - * - * int kernel_execve(const char *fname, char *const argv[], charg *const envp[]) - * a2 a2 a3 a4 - */ - -ENTRY(kernel_execve) - entry a1, 16 - mov a6, a2 # arg0 is in a6 - movi a2, __NR_execve - syscall - - retw - -/* * Task switch. * * struct task* _switch_to (struct task* prev, struct task* next) @@ -1940,6 +1924,6 @@ ENTRY(ret_from_kernel_thread) call4 schedule_tail mov a6, a3 callx4 a2 - call4 do_exit + j common_exception_return ENDPROC(ret_from_kernel_thread) -- 1.7.7.6