Skip to content

Commit c7368dd

Browse files
masahir0yRussell King (Oracle)
authored andcommitted
ARM: 9326/1: 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 <masahiroy@kernel.org> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
1 parent 24d3ba0 commit c7368dd

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

arch/arm/include/asm/domain.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#define __ASM_PROC_DOMAIN_H
99

1010
#ifndef __ASSEMBLY__
11+
#include <linux/thread_info.h>
1112
#include <asm/barrier.h>
12-
#include <asm/thread_info.h>
1313
#endif
1414

1515
/*

arch/arm/include/asm/traps.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#ifndef _ASMARM_TRAP_H
33
#define _ASMARM_TRAP_H
44

5+
#include <linux/linkage.h>
56
#include <linux/list.h>
67

78
struct pt_regs;
@@ -28,7 +29,7 @@ static inline int __in_irqentry_text(unsigned long ptr)
2829
ptr < (unsigned long)&__irqentry_text_end;
2930
}
3031

31-
extern void __init early_trap_init(void *);
32+
extern void early_trap_init(void *);
3233
extern void dump_backtrace_entry(unsigned long where, unsigned long from,
3334
unsigned long frame, const char *loglvl);
3435
extern void ptrace_break(struct pt_regs *regs);

arch/arm/include/asm/uaccess.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/*
99
* User space memory access functions
1010
*/
11+
#include <linux/kernel.h>
1112
#include <linux/string.h>
1213
#include <asm/page.h>
1314
#include <asm/domain.h>

0 commit comments

Comments
 (0)