diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/um/asm/elf.h | 2 | ||||
-rw-r--r-- | arch/x86/um/bugs_32.c | 6 | ||||
-rw-r--r-- | arch/x86/um/bugs_64.c | 2 | ||||
-rw-r--r-- | arch/x86/um/fault.c | 2 | ||||
-rw-r--r-- | arch/x86/um/ldt.c | 10 | ||||
-rw-r--r-- | arch/x86/um/mem_64.c | 6 | ||||
-rw-r--r-- | arch/x86/um/os-Linux/registers.c | 4 | ||||
-rw-r--r-- | arch/x86/um/os-Linux/task_size.c | 2 | ||||
-rw-r--r-- | arch/x86/um/os-Linux/tls.c | 2 | ||||
-rw-r--r-- | arch/x86/um/ptrace_32.c | 8 | ||||
-rw-r--r-- | arch/x86/um/ptrace_user.c | 2 | ||||
-rw-r--r-- | arch/x86/um/shared/sysdep/ptrace.h | 2 | ||||
-rw-r--r-- | arch/x86/um/shared/sysdep/stub.h | 4 | ||||
-rw-r--r-- | arch/x86/um/shared/sysdep/syscalls_32.h | 4 | ||||
-rw-r--r-- | arch/x86/um/signal.c | 4 | ||||
-rw-r--r-- | arch/x86/um/stub_32.S | 2 | ||||
-rw-r--r-- | arch/x86/um/stub_64.S | 2 | ||||
-rw-r--r-- | arch/x86/um/stub_segv.c | 6 | ||||
-rw-r--r-- | arch/x86/um/tls_32.c | 12 | ||||
-rw-r--r-- | arch/x86/um/tls_64.c | 2 |
20 files changed, 42 insertions, 42 deletions
diff --git a/arch/x86/um/asm/elf.h b/arch/x86/um/asm/elf.h index 0e07adc8cbe4..0feee2fd5077 100644 --- a/arch/x86/um/asm/elf.h +++ b/arch/x86/um/asm/elf.h | |||
@@ -6,7 +6,7 @@ | |||
6 | #define __UM_ELF_X86_H | 6 | #define __UM_ELF_X86_H |
7 | 7 | ||
8 | #include <asm/user.h> | 8 | #include <asm/user.h> |
9 | #include "skas.h" | 9 | #include <skas.h> |
10 | 10 | ||
11 | #ifdef CONFIG_X86_32 | 11 | #ifdef CONFIG_X86_32 |
12 | 12 | ||
diff --git a/arch/x86/um/bugs_32.c b/arch/x86/um/bugs_32.c index 17d88cf2c6c4..33daff4dade4 100644 --- a/arch/x86/um/bugs_32.c +++ b/arch/x86/um/bugs_32.c | |||
@@ -4,9 +4,9 @@ | |||
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <signal.h> | 6 | #include <signal.h> |
7 | #include "kern_util.h" | 7 | #include <kern_util.h> |
8 | #include "longjmp.h" | 8 | #include <longjmp.h> |
9 | #include "sysdep/ptrace.h" | 9 | #include <sysdep/ptrace.h> |
10 | #include <generated/asm-offsets.h> | 10 | #include <generated/asm-offsets.h> |
11 | 11 | ||
12 | /* Set during early boot */ | 12 | /* Set during early boot */ |
diff --git a/arch/x86/um/bugs_64.c b/arch/x86/um/bugs_64.c index 44e02ba2a265..8cc8256c698d 100644 --- a/arch/x86/um/bugs_64.c +++ b/arch/x86/um/bugs_64.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Licensed under the GPL | 4 | * Licensed under the GPL |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include "sysdep/ptrace.h" | 7 | #include <sysdep/ptrace.h> |
8 | 8 | ||
9 | void arch_check_bugs(void) | 9 | void arch_check_bugs(void) |
10 | { | 10 | { |
diff --git a/arch/x86/um/fault.c b/arch/x86/um/fault.c index d670f68532f4..8784ab30d91b 100644 --- a/arch/x86/um/fault.c +++ b/arch/x86/um/fault.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * Licensed under the GPL | 3 | * Licensed under the GPL |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "sysdep/ptrace.h" | 6 | #include <sysdep/ptrace.h> |
7 | 7 | ||
8 | /* These two are from asm-um/uaccess.h and linux/module.h, check them. */ | 8 | /* These two are from asm-um/uaccess.h and linux/module.h, check them. */ |
9 | struct exception_table_entry | 9 | struct exception_table_entry |
diff --git a/arch/x86/um/ldt.c b/arch/x86/um/ldt.c index 26b0e39d2ce9..8e08176f0bcb 100644 --- a/arch/x86/um/ldt.c +++ b/arch/x86/um/ldt.c | |||
@@ -7,11 +7,11 @@ | |||
7 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
8 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
9 | #include <asm/unistd.h> | 9 | #include <asm/unistd.h> |
10 | #include "os.h" | 10 | #include <os.h> |
11 | #include "proc_mm.h" | 11 | #include <proc_mm.h> |
12 | #include "skas.h" | 12 | #include <skas.h> |
13 | #include "skas_ptrace.h" | 13 | #include <skas_ptrace.h> |
14 | #include "sysdep/tls.h" | 14 | #include <sysdep/tls.h> |
15 | 15 | ||
16 | extern int modify_ldt(int func, void *ptr, unsigned long bytecount); | 16 | extern int modify_ldt(int func, void *ptr, unsigned long bytecount); |
17 | 17 | ||
diff --git a/arch/x86/um/mem_64.c b/arch/x86/um/mem_64.c index 546518727a73..c6492e75797b 100644 --- a/arch/x86/um/mem_64.c +++ b/arch/x86/um/mem_64.c | |||
@@ -1,6 +1,6 @@ | |||
1 | #include "linux/mm.h" | 1 | #include <linux/mm.h> |
2 | #include "asm/page.h" | 2 | #include <asm/page.h> |
3 | #include "asm/mman.h" | 3 | #include <asm/mman.h> |
4 | 4 | ||
5 | const char *arch_vma_name(struct vm_area_struct *vma) | 5 | const char *arch_vma_name(struct vm_area_struct *vma) |
6 | { | 6 | { |
diff --git a/arch/x86/um/os-Linux/registers.c b/arch/x86/um/os-Linux/registers.c index 0cdbb86b012b..41bfe84e11ab 100644 --- a/arch/x86/um/os-Linux/registers.c +++ b/arch/x86/um/os-Linux/registers.c | |||
@@ -9,8 +9,8 @@ | |||
9 | #ifdef __i386__ | 9 | #ifdef __i386__ |
10 | #include <sys/user.h> | 10 | #include <sys/user.h> |
11 | #endif | 11 | #endif |
12 | #include "longjmp.h" | 12 | #include <longjmp.h> |
13 | #include "sysdep/ptrace_user.h" | 13 | #include <sysdep/ptrace_user.h> |
14 | 14 | ||
15 | int save_fp_registers(int pid, unsigned long *fp_regs) | 15 | int save_fp_registers(int pid, unsigned long *fp_regs) |
16 | { | 16 | { |
diff --git a/arch/x86/um/os-Linux/task_size.c b/arch/x86/um/os-Linux/task_size.c index efb16c5c9bcf..8502ad30e61b 100644 --- a/arch/x86/um/os-Linux/task_size.c +++ b/arch/x86/um/os-Linux/task_size.c | |||
@@ -2,7 +2,7 @@ | |||
2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
3 | #include <signal.h> | 3 | #include <signal.h> |
4 | #include <sys/mman.h> | 4 | #include <sys/mman.h> |
5 | #include "longjmp.h" | 5 | #include <longjmp.h> |
6 | 6 | ||
7 | #ifdef __i386__ | 7 | #ifdef __i386__ |
8 | 8 | ||
diff --git a/arch/x86/um/os-Linux/tls.c b/arch/x86/um/os-Linux/tls.c index 82276b6071af..9d94b3b76c74 100644 --- a/arch/x86/um/os-Linux/tls.c +++ b/arch/x86/um/os-Linux/tls.c | |||
@@ -5,7 +5,7 @@ | |||
5 | #include <sys/syscall.h> | 5 | #include <sys/syscall.h> |
6 | #include <unistd.h> | 6 | #include <unistd.h> |
7 | 7 | ||
8 | #include "sysdep/tls.h" | 8 | #include <sysdep/tls.h> |
9 | 9 | ||
10 | #ifndef PTRACE_GET_THREAD_AREA | 10 | #ifndef PTRACE_GET_THREAD_AREA |
11 | #define PTRACE_GET_THREAD_AREA 25 | 11 | #define PTRACE_GET_THREAD_AREA 25 |
diff --git a/arch/x86/um/ptrace_32.c b/arch/x86/um/ptrace_32.c index 3b949daa095c..ce3dd4f36f3f 100644 --- a/arch/x86/um/ptrace_32.c +++ b/arch/x86/um/ptrace_32.c | |||
@@ -3,10 +3,10 @@ | |||
3 | * Licensed under the GPL | 3 | * Licensed under the GPL |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "linux/mm.h" | 6 | #include <linux/mm.h> |
7 | #include "linux/sched.h" | 7 | #include <linux/sched.h> |
8 | #include "asm/uaccess.h" | 8 | #include <asm/uaccess.h> |
9 | #include "skas.h" | 9 | #include <skas.h> |
10 | 10 | ||
11 | extern int arch_switch_tls(struct task_struct *to); | 11 | extern int arch_switch_tls(struct task_struct *to); |
12 | 12 | ||
diff --git a/arch/x86/um/ptrace_user.c b/arch/x86/um/ptrace_user.c index 3960ca1dd35a..617885b18992 100644 --- a/arch/x86/um/ptrace_user.c +++ b/arch/x86/um/ptrace_user.c | |||
@@ -4,7 +4,7 @@ | |||
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <errno.h> | 6 | #include <errno.h> |
7 | #include "ptrace_user.h" | 7 | #include <ptrace_user.h> |
8 | 8 | ||
9 | int ptrace_getregs(long pid, unsigned long *regs_out) | 9 | int ptrace_getregs(long pid, unsigned long *regs_out) |
10 | { | 10 | { |
diff --git a/arch/x86/um/shared/sysdep/ptrace.h b/arch/x86/um/shared/sysdep/ptrace.h index 6ce2d76eb908..eb9356904ad3 100644 --- a/arch/x86/um/shared/sysdep/ptrace.h +++ b/arch/x86/um/shared/sysdep/ptrace.h | |||
@@ -2,7 +2,7 @@ | |||
2 | #define __SYSDEP_X86_PTRACE_H | 2 | #define __SYSDEP_X86_PTRACE_H |
3 | 3 | ||
4 | #include <generated/user_constants.h> | 4 | #include <generated/user_constants.h> |
5 | #include "sysdep/faultinfo.h" | 5 | #include <sysdep/faultinfo.h> |
6 | 6 | ||
7 | #define MAX_REG_OFFSET (UM_FRAME_SIZE) | 7 | #define MAX_REG_OFFSET (UM_FRAME_SIZE) |
8 | #define MAX_REG_NR ((MAX_REG_OFFSET) / sizeof(unsigned long)) | 8 | #define MAX_REG_NR ((MAX_REG_OFFSET) / sizeof(unsigned long)) |
diff --git a/arch/x86/um/shared/sysdep/stub.h b/arch/x86/um/shared/sysdep/stub.h index bd161e300102..3f55e5bd3cec 100644 --- a/arch/x86/um/shared/sysdep/stub.h +++ b/arch/x86/um/shared/sysdep/stub.h | |||
@@ -1,8 +1,8 @@ | |||
1 | #include <asm/unistd.h> | 1 | #include <asm/unistd.h> |
2 | #include <sys/mman.h> | 2 | #include <sys/mman.h> |
3 | #include <signal.h> | 3 | #include <signal.h> |
4 | #include "as-layout.h" | 4 | #include <as-layout.h> |
5 | #include "stub-data.h" | 5 | #include <stub-data.h> |
6 | 6 | ||
7 | #ifdef __i386__ | 7 | #ifdef __i386__ |
8 | #include "stub_32.h" | 8 | #include "stub_32.h" |
diff --git a/arch/x86/um/shared/sysdep/syscalls_32.h b/arch/x86/um/shared/sysdep/syscalls_32.h index 05cb796aecb5..8436079be914 100644 --- a/arch/x86/um/shared/sysdep/syscalls_32.h +++ b/arch/x86/um/shared/sysdep/syscalls_32.h | |||
@@ -3,8 +3,8 @@ | |||
3 | * Licensed under the GPL | 3 | * Licensed under the GPL |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "asm/unistd.h" | 6 | #include <asm/unistd.h> |
7 | #include "sysdep/ptrace.h" | 7 | #include <sysdep/ptrace.h> |
8 | 8 | ||
9 | typedef long syscall_handler_t(struct pt_regs); | 9 | typedef long syscall_handler_t(struct pt_regs); |
10 | 10 | ||
diff --git a/arch/x86/um/signal.c b/arch/x86/um/signal.c index ba7363ecf896..bdaa08cfbcf4 100644 --- a/arch/x86/um/signal.c +++ b/arch/x86/um/signal.c | |||
@@ -11,8 +11,8 @@ | |||
11 | #include <asm/unistd.h> | 11 | #include <asm/unistd.h> |
12 | #include <asm/uaccess.h> | 12 | #include <asm/uaccess.h> |
13 | #include <asm/ucontext.h> | 13 | #include <asm/ucontext.h> |
14 | #include "frame_kern.h" | 14 | #include <frame_kern.h> |
15 | #include "skas.h" | 15 | #include <skas.h> |
16 | 16 | ||
17 | #ifdef CONFIG_X86_32 | 17 | #ifdef CONFIG_X86_32 |
18 | 18 | ||
diff --git a/arch/x86/um/stub_32.S b/arch/x86/um/stub_32.S index 54a36ec20cb7..b972649d3a18 100644 --- a/arch/x86/um/stub_32.S +++ b/arch/x86/um/stub_32.S | |||
@@ -1,4 +1,4 @@ | |||
1 | #include "as-layout.h" | 1 | #include <as-layout.h> |
2 | 2 | ||
3 | .globl syscall_stub | 3 | .globl syscall_stub |
4 | .section .__syscall_stub, "ax" | 4 | .section .__syscall_stub, "ax" |
diff --git a/arch/x86/um/stub_64.S b/arch/x86/um/stub_64.S index 20e4a96a6dcb..7160b20172d0 100644 --- a/arch/x86/um/stub_64.S +++ b/arch/x86/um/stub_64.S | |||
@@ -1,4 +1,4 @@ | |||
1 | #include "as-layout.h" | 1 | #include <as-layout.h> |
2 | 2 | ||
3 | .globl syscall_stub | 3 | .globl syscall_stub |
4 | .section .__syscall_stub, "ax" | 4 | .section .__syscall_stub, "ax" |
diff --git a/arch/x86/um/stub_segv.c b/arch/x86/um/stub_segv.c index b7450bd22e7d..1518d2805ae8 100644 --- a/arch/x86/um/stub_segv.c +++ b/arch/x86/um/stub_segv.c | |||
@@ -3,9 +3,9 @@ | |||
3 | * Licensed under the GPL | 3 | * Licensed under the GPL |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "sysdep/stub.h" | 6 | #include <sysdep/stub.h> |
7 | #include "sysdep/faultinfo.h" | 7 | #include <sysdep/faultinfo.h> |
8 | #include "sysdep/mcontext.h" | 8 | #include <sysdep/mcontext.h> |
9 | 9 | ||
10 | void __attribute__ ((__section__ (".__syscall_stub"))) | 10 | void __attribute__ ((__section__ (".__syscall_stub"))) |
11 | stub_segv_handler(int sig, siginfo_t *info, void *p) | 11 | stub_segv_handler(int sig, siginfo_t *info, void *p) |
diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c index baba84f8ecb8..5f5feff3d24c 100644 --- a/arch/x86/um/tls_32.c +++ b/arch/x86/um/tls_32.c | |||
@@ -3,12 +3,12 @@ | |||
3 | * Licensed under the GPL | 3 | * Licensed under the GPL |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "linux/percpu.h" | 6 | #include <linux/percpu.h> |
7 | #include "linux/sched.h" | 7 | #include <linux/sched.h> |
8 | #include "asm/uaccess.h" | 8 | #include <asm/uaccess.h> |
9 | #include "os.h" | 9 | #include <os.h> |
10 | #include "skas.h" | 10 | #include <skas.h> |
11 | #include "sysdep/tls.h" | 11 | #include <sysdep/tls.h> |
12 | 12 | ||
13 | /* | 13 | /* |
14 | * If needed we can detect when it's uninitialized. | 14 | * If needed we can detect when it's uninitialized. |
diff --git a/arch/x86/um/tls_64.c b/arch/x86/um/tls_64.c index f7ba46200ecd..d22363cb854e 100644 --- a/arch/x86/um/tls_64.c +++ b/arch/x86/um/tls_64.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #include "linux/sched.h" | 1 | #include <linux/sched.h> |
2 | 2 | ||
3 | void clear_flushed_tls(struct task_struct *task) | 3 | void clear_flushed_tls(struct task_struct *task) |
4 | { | 4 | { |