From: Tong Tiangen <tongtiangen@huawei.com>
To: Mark Rutland <mark.rutland@arm.com>,
James Morse <james.morse@arm.com>,
Andrew Morton <akpm@linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Robin Murphy <robin.murphy@arm.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>, <x86@kernel.org>,
"H . Peter Anvin" <hpa@zytor.com>
Cc: <linuxppc-dev@lists.ozlabs.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <linux-mm@kvack.org>,
Kefeng Wang <wangkefeng.wang@huawei.com>,
Xie XiuQi <xiexiuqi@huawei.com>, Guohanjun <guohanjun@huawei.com>,
Tong Tiangen <tongtiangen@huawei.com>
Subject: [PATCH -next v4 1/7] x86, powerpc: fix function define in copy_mc_to_user
Date: Wed, 20 Apr 2022 03:04:12 +0000 [thread overview]
Message-ID: <20220420030418.3189040-2-tongtiangen@huawei.com> (raw)
In-Reply-To: <20220420030418.3189040-1-tongtiangen@huawei.com>
x86/powerpc has it's implementation of copy_mc_to_user but not use #define
to declare.
This may cause problems, for example, if other architectures open
CONFIG_ARCH_HAS_COPY_MC, but want to use copy_mc_to_user() outside the
architecture, the code add to include/linux/uaddess.h is as follows:
#ifndef copy_mc_to_user
static inline unsigned long __must_check
copy_mc_to_user(void *dst, const void *src, size_t cnt)
{
...
}
#endif
Then this definition will conflict with the implementation of x86/powerpc
and cause compilation errors as follow:
Fixes: ec6347bb4339 ("x86, powerpc: Rename memcpy_mcsafe() to copy_mc_to_{user, kernel}()")
Signed-off-by: Tong Tiangen <tongtiangen@huawei.com>
---
arch/powerpc/include/asm/uaccess.h | 1 +
arch/x86/include/asm/uaccess.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
index 9b82b38ff867..58dbe8e2e318 100644
--- a/arch/powerpc/include/asm/uaccess.h
+++ b/arch/powerpc/include/asm/uaccess.h
@@ -358,6 +358,7 @@ copy_mc_to_user(void __user *to, const void *from, unsigned long n)
return n;
}
+#define copy_mc_to_user copy_mc_to_user
#endif
extern long __copy_from_user_flushcache(void *dst, const void __user *src,
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
index f78e2b3501a1..e18c5f098025 100644
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@@ -415,6 +415,7 @@ copy_mc_to_kernel(void *to, const void *from, unsigned len);
unsigned long __must_check
copy_mc_to_user(void *to, const void *from, unsigned len);
+#define copy_mc_to_user copy_mc_to_user
#endif
/*
--
2.25.1
next prev parent reply other threads:[~2022-04-20 2:45 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-20 3:04 [PATCH -next v4 0/7]arm64: add machine check safe support Tong Tiangen
2022-04-20 3:04 ` Tong Tiangen [this message]
2022-04-22 9:45 ` [PATCH -next v4 1/7] x86, powerpc: fix function define in copy_mc_to_user Michael Ellerman
2022-04-24 1:16 ` Tong Tiangen
2022-05-02 14:24 ` Christophe Leroy
2022-05-03 1:06 ` Tong Tiangen
2022-05-05 1:21 ` Kefeng Wang
2022-04-20 3:04 ` [PATCH -next v4 2/7] arm64: fix types in copy_highpage() Tong Tiangen
2022-04-20 3:04 ` [PATCH -next v4 3/7] arm64: add support for machine check error safe Tong Tiangen
2022-05-13 15:26 ` Mark Rutland
2022-05-19 6:29 ` Tong Tiangen
2022-05-25 8:30 ` Mark Rutland
2022-05-26 3:36 ` Tong Tiangen
2022-05-26 9:50 ` Mark Rutland
2022-05-27 1:40 ` Tong Tiangen
2022-04-20 3:04 ` [PATCH -next v4 4/7] arm64: add copy_{to, from}_user to machine check safe Tong Tiangen
2022-05-04 10:26 ` Catalin Marinas
2022-05-05 6:39 ` Tong Tiangen
2022-05-05 13:41 ` Catalin Marinas
2022-05-05 14:33 ` Tong Tiangen
2022-05-13 15:31 ` Mark Rutland
2022-05-19 6:53 ` Tong Tiangen
2022-04-20 3:04 ` [PATCH -next v4 5/7] arm64: mte: Clean up user tag accessors Tong Tiangen
2022-05-13 15:36 ` Mark Rutland
2022-04-20 3:04 ` [PATCH -next v4 6/7] arm64: add {get, put}_user to machine check safe Tong Tiangen
2022-05-13 15:39 ` Mark Rutland
2022-05-19 7:09 ` Tong Tiangen
2022-04-20 3:04 ` [PATCH -next v4 7/7] arm64: add cow " Tong Tiangen
2022-05-13 15:44 ` Mark Rutland
2022-05-19 10:38 ` Tong Tiangen
2022-04-27 9:09 ` [PATCH -next v4 0/7]arm64: add machine check safe support Tong Tiangen
2022-05-04 19:58 ` (subset) " Catalin Marinas
2022-05-16 18:45 ` Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220420030418.3189040-2-tongtiangen@huawei.com \
--to=tongtiangen@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.org \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=dave.hansen@linux.intel.com \
--cc=guohanjun@huawei.com \
--cc=hpa@zytor.com \
--cc=james.morse@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=robin.murphy@arm.com \
--cc=tglx@linutronix.de \
--cc=viro@zeniv.linux.org.uk \
--cc=wangkefeng.wang@huawei.com \
--cc=will@kernel.org \
--cc=x86@kernel.org \
--cc=xiexiuqi@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox