2023-09-26 17:27:01

by Masahiro Yamada

Subject: [PATCH] ARM: make <linux/uaccess.h> self-contained for ARM

When I compiled the following code for ARM, I encountered numerous
errors.

[Test Code]

#include <linux/compiler.h>
#include <linux/uaccess.h>

int foo(int *x, int __user *ptr)
{
return get_user(*x, ptr);
}

To fix them, make some asm headers self-contained:

1. In arch/arm/include/asm/traps.h, include <linux/init.h> for __init,
and <linux/linkage.h> for asmlinkage.

2. In arch/arm/include/asm/domain.h, include <linux/thread_info.h>
for current_thread_info().

3. In arch/arm/include/asm/uaccess.h, include <linux/kernel.h> for
might_fault().

Signed-off-by: Masahiro Yamada <[email protected]>
---

KernelVersion: v6.6-rc1

arch/arm/include/asm/domain.h | 2 +-
arch/arm/include/asm/traps.h | 2 ++
arch/arm/include/asm/uaccess.h | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
index 41536feb4392..d48859fdf32c 100644
--- a/arch/arm/include/asm/domain.h
+++ b/arch/arm/include/asm/domain.h
@@ -8,8 +8,8 @@
#define __ASM_PROC_DOMAIN_H

#ifndef __ASSEMBLY__
+#include <linux/thread_info.h>
#include <asm/barrier.h>
-#include <asm/thread_info.h>
#endif

/*
diff --git a/arch/arm/include/asm/traps.h b/arch/arm/include/asm/traps.h
index 0aaefe3e1700..d44df9eac170 100644
--- a/arch/arm/include/asm/traps.h
+++ b/arch/arm/include/asm/traps.h
@@ -2,6 +2,8 @@
#ifndef _ASMARM_TRAP_H
#define _ASMARM_TRAP_H

+#include <linux/init.h>
+#include <linux/linkage.h>
#include <linux/list.h>

struct pt_regs;
diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
index bb5c81823117..6a2cc57f015a 100644
--- a/arch/arm/include/asm/uaccess.h
+++ b/arch/arm/include/asm/uaccess.h
@@ -8,6 +8,7 @@
/*
* User space memory access functions
*/
+#include <linux/kernel.h>
#include <linux/string.h>
#include <asm/page.h>
#include <asm/domain.h>
--
2.39.2

2023-09-26 17:40:30

by Russell King (Oracle)

Subject: Re: [PATCH] ARM: make <linux/uaccess.h> self-contained for ARM

On Wed, Sep 27, 2023 at 02:22:53AM +0900, Masahiro Yamada wrote:
> When I compiled the following code for ARM, I encountered numerous
> errors.
>
> [Test Code]
>
> #include <linux/compiler.h>
> #include <linux/uaccess.h>
>
> int foo(int *x, int __user *ptr)
> {
> return get_user(*x, ptr);
> }
>
> To fix them, make some asm headers self-contained:
>
> 1. In arch/arm/include/asm/traps.h, include <linux/init.h> for __init,
> and <linux/linkage.h> for asmlinkage.

Please drop the __init marking instead of adding linux/init.h, it's
not necessary.

Thanks.

--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!