From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 382B9C55191 for ; Sat, 25 Apr 2020 11:08:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A64A206EC for ; Sat, 25 Apr 2020 11:08:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Q88bnzeX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726165AbgDYLIt (ORCPT ); Sat, 25 Apr 2020 07:08:49 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:44566 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726151AbgDYLIr (ORCPT ); Sat, 25 Apr 2020 07:08:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587812926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ofPRNPiKndJ+19yFksMsIFZm5zHoy/SE96l7lsxCjLM=; b=Q88bnzeXb4V1VlyGp6qeHxLN6mMTrY2EVJcryu449QPgmTgdmwClTZGdvKeH7tPFhVxCXL pXjTtH0goW8/nA2bPpYLP/YkjjFtqK3bcgYiEm0fH6hx7OvzRIXMyIYpCT/zCu6Wd0Bgw2 0Tpb8X2IzYpIIBIpDn8EcVdOptP7VDM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-232-AM4CndC3Nde2qH1gRdX33g-1; Sat, 25 Apr 2020 07:08:44 -0400 X-MC-Unique: AM4CndC3Nde2qH1gRdX33g-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 975C11005510; Sat, 25 Apr 2020 11:08:43 +0000 (UTC) Received: from treble.redhat.com (ovpn-114-29.rdu2.redhat.com [10.10.114.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 96014605D6; Sat, 25 Apr 2020 11:08:41 +0000 (UTC) From: Josh Poimboeuf To: live-patching@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Jessica Yu , Joe Lawrence , linux-s390@vger.kernel.org, heiko.carstens@de.ibm.com Subject: [PATCH v3 05/10] s390: Change s390_kernel_write() return type to match memcpy() Date: Sat, 25 Apr 2020 06:07:25 -0500 Message-Id: <6ddfa9a98db346f295249fbfdbf80e7a18fbabf0.1587812518.git.jpoimboe@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Content-Transfer-Encoding: quoted-printable Sender: live-patching-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: live-patching@vger.kernel.org s390_kernel_write()'s function type is almost identical to memcpy(). Change its return type to "void *" so they can be used interchangeably. Cc: linux-s390@vger.kernel.org Cc: heiko.carstens@de.ibm.com Signed-off-by: Josh Poimboeuf --- arch/s390/include/asm/uaccess.h | 2 +- arch/s390/mm/maccess.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uacc= ess.h index a470f1fa9f2a..324438889fe1 100644 --- a/arch/s390/include/asm/uaccess.h +++ b/arch/s390/include/asm/uaccess.h @@ -276,6 +276,6 @@ static inline unsigned long __must_check clear_user(v= oid __user *to, unsigned lo } =20 int copy_to_user_real(void __user *dest, void *src, unsigned long count)= ; -void s390_kernel_write(void *dst, const void *src, size_t size); +void *s390_kernel_write(void *dst, const void *src, size_t size); =20 #endif /* __S390_UACCESS_H */ diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c index de7ca4b6718f..22a0be655f27 100644 --- a/arch/s390/mm/maccess.c +++ b/arch/s390/mm/maccess.c @@ -55,19 +55,22 @@ static notrace long s390_kernel_write_odd(void *dst, = const void *src, size_t siz */ static DEFINE_SPINLOCK(s390_kernel_write_lock); =20 -void notrace s390_kernel_write(void *dst, const void *src, size_t size) +notrace void *s390_kernel_write(void *dst, const void *src, size_t size) { + void *tmp =3D dst; unsigned long flags; long copied; =20 spin_lock_irqsave(&s390_kernel_write_lock, flags); while (size) { - copied =3D s390_kernel_write_odd(dst, src, size); - dst +=3D copied; + copied =3D s390_kernel_write_odd(tmp, src, size); + tmp +=3D copied; src +=3D copied; size -=3D copied; } spin_unlock_irqrestore(&s390_kernel_write_lock, flags); + + return dst; } =20 static int __no_sanitize_address __memcpy_real(void *dest, void *src, si= ze_t count) --=20 2.21.1