From patchwork Thu May 29 17:04:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 353806 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 421DA140098 for ; Fri, 30 May 2014 03:05:32 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=PwGH7tkYVmwk/SQMPS05+9WnmZud5Tp Qk/uapFH8anM/rTRCLvjnVOrsTkQBROISdCCP4A6I3aSUzgZ/thknixE4Jr6WsXi UzzQ6CTp0Q8m2iqXR54cMhpdDVJBMmQzpdi4d2puc6BaXzAjvlJsSburpoHaPVyA +7WlpVN3Eh7s= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=ILf/NX0s4OS+7adYHx/DylXbFb4=; b=xOamx ckVyE+U+TbYXqpEK1JRsrYgvP0/szUXsfHUJxsYdatV5+7vOJI2Nicr8z94yfvno 0YUhnL78W6J3PHpkAKEZF8le2nk1QIrxjPCMXLQ6AUUIO6AFDroSPAl6HEcCYOcg Z58HQBrMYVhTjsP8mSq3ZlpyIXs99zY2cBpgtc= Received: (qmail 18596 invoked by alias); 29 May 2014 17:05:16 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 18419 invoked by uid 89); 29 May 2014 17:05:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=no version=3.3.2 X-HELO: mail-qg0-f54.google.com X-Received: by 10.224.136.65 with SMTP id q1mr12279798qat.93.1401383112717; Thu, 29 May 2014 10:05:12 -0700 (PDT) From: Richard Henderson To: libc-alpha@sourceware.org Cc: marcus.shawcroft@gmail.com, Richard Henderson Subject: [PATCH v3.5 1/2] aarch64: Fix error return from __ioctl Date: Thu, 29 May 2014 10:04:37 -0700 Message-Id: <1401383078-32544-2-git-send-email-rth@twiddle.net> In-Reply-To: <1401383078-32544-1-git-send-email-rth@twiddle.net> References: <1401383078-32544-1-git-send-email-rth@twiddle.net> From: Richard Henderson Forgotten in ca3cfa40c16ef34c74951a07a57cfcbcd58898b1 where the error branch was moved from PSEUDO_RET. --- sysdeps/unix/sysv/linux/aarch64/ioctl.S | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sysdeps/unix/sysv/linux/aarch64/ioctl.S b/sysdeps/unix/sysv/linux/aarch64/ioctl.S index 4443f5a..8920a20 100644 --- a/sysdeps/unix/sysv/linux/aarch64/ioctl.S +++ b/sysdeps/unix/sysv/linux/aarch64/ioctl.S @@ -20,11 +20,12 @@ .text ENTRY(__ioctl) - movz x8, #__NR_ioctl - sxtw x0, w0 - svc #0x0 - cmn x0, #0x1, lsl #12 - PSEUDO_RET - PSEUDO_END (__ioctl) + mov x8, #__NR_ioctl + sxtw x0, w0 + svc #0x0 + cmn x0, #4095 + b.cs .Lsyscall_error + ret +PSEUDO_END (__ioctl) weak_alias (__ioctl, ioctl)