ARM: make <linux/uaccess.h> self-contained for ARM
PATCH 1/1 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 the errors, make some asm headers self-contained:
1. In arch/arm/include/asm/domain.h, include <linux/thread_info.h> for current_thread_info().
2. In arch/arm/include/asm/traps.h, remove unneeded __init, and include <linux/linkage.h> for asmlinkage.
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 | 3 ++- arch/arm/include/asm/uaccess.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-)
arch/arm/include/asm/domain.h +1 -1
@@ -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 /*
arch/arm/include/asm/traps.h +2 -1
@@ -2,6 +2,7 @@#ifndef _ASMARM_TRAP_H#define _ASMARM_TRAP_H +#include <linux/linkage.h> #include <linux/list.h> struct pt_regs ;
@@ -28,7 +29,7 @@ static inline int __in_irqentry_text(unsigned long ptr) ptr < (unsigned long )&__irqentry_text_end; } -extern void __init early_trap_init (void *); +extern void early_trap_init (void *);extern void dump_backtrace_entry (unsigned long where,unsigned long from,unsigned long frame,const char *loglvl);extern void ptrace_break (struct pt_regs *regs);
arch/arm/include/asm/uaccess.h +1 -0
@@ -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>
Signature · 1 line
2.39.2