Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp683649pxf; Wed, 7 Apr 2021 09:07:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOPyEkeUdXYlVz/PWQDFk04HJ8hDIxiRwm5tIicaIW+1W7JW+R+Uc6LxDc7j76X8BqLx4h X-Received: by 2002:a50:9b18:: with SMTP id o24mr5330020edi.227.1617811643255; Wed, 07 Apr 2021 09:07:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617811643; cv=none; d=google.com; s=arc-20160816; b=nukj3KlYnA7ImIn9y/TxHH/uAyxdOyQ+H7VXMhXzwNehCyASA9ZkkVzC1KsaTaRCqk 4U70WZKY18vK+txpV6d6DsnwAceDc6RfS+6iE6FVjozEzUF5uDmchm26lmYG8G577wJ4 ybFWakIlgcmU0C+eFbBCBhN9TVECgVCYbfpRfitp8TVQOG/6S/5TaR0dpo6nEX4PDmWD oIMO4D+8tFbs7ihDRwtgjk0/DkzZYmv4j814R6F2atqlD9xRqiXAaNcNVFSZxiUxYPX8 sAV/uCgx2Q/FqlogEHgSf3k1bDs+bcpkORjlQr+qJeWZYuJJpti3t1yvYAAku1FJjICQ zWvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:to:from; bh=lGnn9y2n1Tv13d9smmZflh4pfHvGsha0e6/gHpw9Cdg=; b=ynd5LQFHPdaghgH2HxiVETt0tCNZOoq8WZNhA7TLMpZwJR3avkJT1Er7yN/LVFpr4V muFzv+Mqu+sime7YJLxW0Z2doaBvgDdt0y9mShXLFClhunnVwBijANz6Fo8atJDQ47+M c9sBwFR1DEehULSMc7nhGzAaLpW68ex/Dtxqf2eHVgloGcEjrxhdV+T+ZA+dJcmWKQ+Y bVhVHhPYmH3suljmufNbjh2ceSL3EhbbyDPhgDJgcOh3+NkpvrUgLMet4B3DS/Tv3mk3 kGoQ2rwuBy0S7nkmn6vmdbd+wz9Le07xHCXLf1P/cKKGQz2mHMmrAn7vOwCIfuavdhiy /PHQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q2si627818ejf.168.2021.04.07.09.06.58; Wed, 07 Apr 2021 09:07:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237405AbhDFXED (ORCPT + 99 others); Tue, 6 Apr 2021 19:04:03 -0400 Received: from mx2.suse.de ([195.135.220.15]:55872 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233379AbhDFXEC (ORCPT ); Tue, 6 Apr 2021 19:04:02 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 9457EB01F; Tue, 6 Apr 2021 23:03:52 +0000 (UTC) From: Thomas Bogendoerfer To: linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] MIPS: Fix new sparse warning Date: Wed, 7 Apr 2021 01:03:48 +0200 Message-Id: <20210406230348.130713-1-tsbogend@alpha.franken.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 45deb5faeb9e ("MIPS: uaccess: Remove get_fs/set_fs call sites") caused a few new sparse warning, fix them. Signed-off-by: Thomas Bogendoerfer --- arch/mips/kernel/access-helper.h | 7 ++++--- arch/mips/kernel/unaligned.c | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/mips/kernel/access-helper.h b/arch/mips/kernel/access-helper.h index dd5b502813b8..590388031503 100644 --- a/arch/mips/kernel/access-helper.h +++ b/arch/mips/kernel/access-helper.h @@ -4,15 +4,16 @@ static inline int __get_addr(unsigned long *a, unsigned long *p, bool user) { - return user ? get_user(*a, p) : get_kernel_nofault(*a, p); + return user ? get_user(*a, (unsigned long __user *)p) : + get_kernel_nofault(*a, p); } static inline int __get_inst16(u16 *i, u16 *p, bool user) { - return user ? get_user(*i, p) : get_kernel_nofault(*i, p); + return user ? get_user(*i, (u16 __user *)p) : get_kernel_nofault(*i, p); } static inline int __get_inst32(u32 *i, u32 *p, bool user) { - return user ? get_user(*i, p) : get_kernel_nofault(*i, p); + return user ? get_user(*i, (u32 __user *)p) : get_kernel_nofault(*i, p); } diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c index 1f3b20a8c377..df4b708c04a9 100644 --- a/arch/mips/kernel/unaligned.c +++ b/arch/mips/kernel/unaligned.c @@ -109,7 +109,7 @@ static u32 unaligned_action; extern void show_registers(struct pt_regs *regs); static void emulate_load_store_insn(struct pt_regs *regs, - void __user *addr, unsigned int __user *pc) + void __user *addr, unsigned int *pc) { unsigned long origpc, orig31, value; union mips_instruction insn; @@ -1475,7 +1475,7 @@ static void emulate_load_store_MIPS16e(struct pt_regs *regs, void __user * addr) asmlinkage void do_ade(struct pt_regs *regs) { enum ctx_state prev_state; - unsigned int __user *pc; + unsigned int *pc; prev_state = exception_enter(); perf_sw_event(PERF_COUNT_SW_ALIGNMENT_FAULTS, @@ -1526,7 +1526,7 @@ asmlinkage void do_ade(struct pt_regs *regs) if (unaligned_action == UNALIGNED_ACTION_SHOW) show_registers(regs); - pc = (unsigned int __user *)exception_epc(regs); + pc = (unsigned int *)exception_epc(regs); emulate_load_store_insn(regs, (void __user *)regs->cp0_badvaddr, pc); -- 2.29.2