From patchwork Thu Apr 14 15:11:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Edworthy X-Patchwork-Id: 707241 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3EFB46J012775 for ; Thu, 14 Apr 2011 15:12:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753602Ab1DNPMN (ORCPT ); Thu, 14 Apr 2011 11:12:13 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:61294 "EHLO relmlor3.renesas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752549Ab1DNPMM (ORCPT ); Thu, 14 Apr 2011 11:12:12 -0400 Received: from relmlir2.idc.renesas.com ([10.200.68.152]) by relmlor3.idc.renesas.com ( SJSMS) with ESMTP id <0LJN00B27E8BHJ90@relmlor3.idc.renesas.com> for linux-sh@vger.kernel.org; Fri, 15 Apr 2011 00:12:11 +0900 (JST) Received: from relmlac4.idc.renesas.com ([10.200.69.24]) by relmlir2.idc.renesas.com ( SJSMS) with ESMTP id <0LJN00L8UE8BLUA0@relmlir2.idc.renesas.com> for linux-sh@vger.kernel.org; Fri, 15 Apr 2011 00:12:11 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 84E4B48087; Fri, 15 Apr 2011 00:12:11 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 7D1AF4807B; Fri, 15 Apr 2011 00:12:11 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id AAR21312; Fri, 15 Apr 2011 00:12:11 +0900 X-IronPort-AV: E=Sophos; i="4.64,211,1301842800"; d="scan'208"; a="21713952" Received: from unknown (HELO rte-idc-bh1.RTE.ADWIN.RENESAS.COM) ([172.28.64.243]) by relmlii2.idc.renesas.com with ESMTP; Fri, 15 Apr 2011 00:12:10 +0900 Received: from rte-ben-exch.RTE.ADWIN.RENESAS.COM ([172.29.42.16]) by rte-idc-bh1.RTE.ADWIN.RENESAS.COM with Microsoft SMTPSVC(6.0.3790.211) ; Thu, 14 Apr 2011 16:12:07 +0100 Received: from ubuntu ([172.29.43.69]) by rte-ben-exch.RTE.ADWIN.RENESAS.COM with Microsoft SMTPSVC(6.0.3790.3959); Thu, 14 Apr 2011 16:12:06 +0100 From: Phil Edworthy To: stable@kernel.org Cc: linux-sh@vger.kernel.org, Phil Edworthy Subject: [PATCH] 2.6.35.y: Revert "SH: Add missing consts to sys_execve() declaration" Date: Thu, 14 Apr 2011 16:11:35 +0100 Message-id: <1302793895-725-1-git-send-email-phil.edworthy@renesas.com> X-Mailer: git-send-email 1.7.1 X-OriginalArrivalTime: 14 Apr 2011 15:12:06.0232 (UTC) FILETIME=[51214D80:01CBFAB6] Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 14 Apr 2011 15:12:13 +0000 (UTC) This reverts commit 1219932ca26da2026e598590a3b7a2f36b3c3621 (commit d8b5fc01683c66060edc202d6bb5635365822181 upstream). The reverted commit depends on an upstream commit that has not been applied to 2.6.35.y (d7627467b7a8dd6944885290a03a07ceb28c10eb). This fixes a build failure on all SH devices: /arch/sh/kernel/process_32.c:299: error: conflicting types for 'sys_execve' /arch/sh/include/asm/syscalls_32.h:22: note: previous declaration of 'sys_execve' was here Signed-off-by: Phil Edworthy --- arch/sh/include/asm/syscalls_32.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h index 611e92d..8b30200 100644 --- a/arch/sh/include/asm/syscalls_32.h +++ b/arch/sh/include/asm/syscalls_32.h @@ -19,8 +19,8 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, asmlinkage int sys_vfork(unsigned long r4, unsigned long r5, unsigned long r6, unsigned long r7, struct pt_regs __regs); -asmlinkage int sys_execve(char __user *ufilename, const char __user * __user *uargv, - const char __user * __user *uenvp, unsigned long r7, +asmlinkage int sys_execve(char __user *ufilename, char __user * __user *uargv, + char __user * __user *uenvp, unsigned long r7, struct pt_regs __regs); asmlinkage int sys_sigsuspend(old_sigset_t mask, unsigned long r5, unsigned long r6, unsigned long r7,