Message ID | 20230503-virt-to-pfn-v6-4-rc1-v1-8-6c4698dcf9c8@linaro.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp4318632vqo; Thu, 11 May 2023 05:10:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ60Qvwq/0H3uGxBvoRoyWm49uorl+LOp+EMxUsFl+kuk8k4sUQhdu54dWy1RJEMkQBuiLza X-Received: by 2002:a05:6a20:1583:b0:100:9740:78a5 with SMTP id h3-20020a056a20158300b00100974078a5mr16146275pzj.38.1683807045018; Thu, 11 May 2023 05:10:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683807045; cv=none; d=google.com; s=arc-20160816; b=1Ic/1rjv25pcREJ9lGDGqr8+D0Cp4tivfpRvnNbGBZQ6hvj0tdDXnv6YoF6Q1rwdup 4fbryaKNmz2mDwOKdcRtZT4TYKgogsddHU31f0jzp96DpJVdnmIAnwxkfYshk/4074zN kHZym0PCJ5KWsZrtb4vU5iUUM5Jqp7fHuSxy1FaoxxU/5rWvZpbw0cdkbc8j2d39hKBL /XKSfXn97r49PIciUmECcbEC7JNRKtb6XNIDPKO6X+QtIGil8CYFQC9q+IUfmgIobZys zQNdvr2O2SuKpdzvsJCgZ+/N4tdtQH8NRDLg1EsdLYsqDvbvmhfW0pYQid/iUM9UFK5v s4Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=xp9YXKX/mdPfR3Groy/h2+S4HOih/XO/GthWPwB3ikY=; b=qHmVNFQ/8xjWRoYUvZ1ZyOidlEQHVdNsT0wQffF3+h1kN31dKYGCEZgCbcTJKe64T5 3HzTCdBBGWhhqVWmt8TzsYT3Ns7KAh6EN3NrUXeyJ5hM8NT8F/IPxI2Noj425saIKhdj eIMr+dCZNpHsyHEHHNVcqqknvYlkBMQ3sTNlWayFZuONibfxHNbVdUh2vfLznQb/D9tY cgOlpmEDpeFK3VxG26WCQrbgB9IfPbuwlvgjPUPkDQHT0rzR3xcPRpM3+SQUteBkoSUY oH/Z8bjJgihy/IAFm2J/vi5CQcsvIiqm6WVBohlwxw1RguarJj6Rk5HyN1UCk8LkfpA3 mlqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VET6NG7w; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i69-20020a639d48000000b0051948f1993fsi6343547pgd.40.2023.05.11.05.10.28; Thu, 11 May 2023 05:10:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VET6NG7w; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237927AbjEKMAt (ORCPT <rfc822;peekingduck44@gmail.com> + 99 others); Thu, 11 May 2023 08:00:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237880AbjEKMAR (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 11 May 2023 08:00:17 -0400 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 963BDAD1B for <linux-kernel@vger.kernel.org>; Thu, 11 May 2023 04:59:56 -0700 (PDT) Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-4f00d41df22so46715433e87.1 for <linux-kernel@vger.kernel.org>; Thu, 11 May 2023 04:59:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683806394; x=1686398394; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=xp9YXKX/mdPfR3Groy/h2+S4HOih/XO/GthWPwB3ikY=; b=VET6NG7wZTvecZWmT897hwjurDC79ewy9skuHZ0BAg8j6WG0HpKT+cKQYjlNZZqhS9 ZBHD1UegBUAZIn6kmSpxYJxUFcYOnfNE4nWrjQj8Sh+Uyggour6jRxMf7LS9/IF5rBFy W4iB0k1o3MdtFYsa9QEggKETjWUSzFkIw+N/2yuZwaQ++xxuXjedgdW2WIuJ65DMFPN/ e/9mK8nx3Y3hIAMMKkRttccO2avl3pany6MQBtJ/no8qfzNa5YL3EsRjrPJBi0xnB1Ix DgFTea1Sh8U9UP6E0E8bSwiu4w89Knjloaax/XSVZRxAotV+hiMJu+jl4YaOwMPz+gGa V0LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683806394; x=1686398394; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xp9YXKX/mdPfR3Groy/h2+S4HOih/XO/GthWPwB3ikY=; b=WFWUb9kX5i8blJB5fQFhwlzdmfj3+dIjcbRudcukln0XANxu3LZz4ZBigx46EjTJGW FGZLQPU9cc6FPE5bzyvlOItWmZX9iokLVv1IxHxS5v5YHQDrbdfLB21uqroVCZeLyX7Z xPsJ2L764dIbVu+T2Tj6Mz2bdcdVldRGQAQwQbdbo4uvqvLN9vR/aLR3Ba84IGgyxREg r92JC6/AlUlrk4mthmx8WPiRUahj0SDD5dUPE1p5PzEGP7htMThILfCzoWecbZg+T02T QLYbzybADqX3C9uoX/6YSqFnIgSFLOiOsUq8/CTDEBAYTIaOFi1J4bWxuXVaR7o4I7W9 6Kxg== X-Gm-Message-State: AC+VfDzfetScQ860zcfUeGSQm3ccOWbR0//XWm3ses/EYQAGB1bWYstF lWu5q1dHMQWZLaupsX48TgJtww== X-Received: by 2002:ac2:4d03:0:b0:4ef:ebbb:2cf5 with SMTP id r3-20020ac24d03000000b004efebbb2cf5mr3050896lfi.17.1683806394609; Thu, 11 May 2023 04:59:54 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id f16-20020ac25090000000b004cb23904bd9sm1100841lfm.144.2023.05.11.04.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 04:59:54 -0700 (PDT) From: Linus Walleij <linus.walleij@linaro.org> Date: Thu, 11 May 2023 13:59:25 +0200 Subject: [PATCH 08/12] arm64: vdso: Pass (void *) to virt_to_page() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230503-virt-to-pfn-v6-4-rc1-v1-8-6c4698dcf9c8@linaro.org> References: <20230503-virt-to-pfn-v6-4-rc1-v1-0-6c4698dcf9c8@linaro.org> In-Reply-To: <20230503-virt-to-pfn-v6-4-rc1-v1-0-6c4698dcf9c8@linaro.org> To: Geert Uytterhoeven <geert@linux-m68k.org>, Vineet Gupta <vgupta@kernel.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Arnd Bergmann <arnd@arndb.de>, Russell King <linux@armlinux.org.uk>, Greg Ungerer <gerg@linux-m68k.org> Cc: linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-snps-arc@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org> X-Mailer: b4 0.12.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765599656084824577?= X-GMAIL-MSGID: =?utf-8?q?1765599656084824577?= |
Series |
arch: Make virt_to_pfn into a static inline
|
|
Commit Message
Linus Walleij
May 11, 2023, 11:59 a.m. UTC
Like the other calls in this function virt_to_page() expects
a pointer, not an integer.
However since many architectures implement virt_to_pfn() as
a macro, this function becomes polymorphic and accepts both a
(unsigned long) and a (void *).
Fix this up with an explicit cast.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
arch/arm64/kernel/vdso.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Thu, May 11, 2023 at 01:59:25PM +0200, Linus Walleij wrote: > Like the other calls in this function virt_to_page() expects > a pointer, not an integer. > > However since many architectures implement virt_to_pfn() as > a macro, this function becomes polymorphic and accepts both a > (unsigned long) and a (void *). > > Fix this up with an explicit cast. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 0119dc91abb5..d9e1355730ef 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -288,7 +288,7 @@ static int aarch32_alloc_kuser_vdso_page(void) memcpy((void *)(vdso_page + 0x1000 - kuser_sz), __kuser_helper_start, kuser_sz); - aarch32_vectors_page = virt_to_page(vdso_page); + aarch32_vectors_page = virt_to_page((void *)vdso_page); return 0; }