aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/os-Linux
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um/os-Linux')
-rw-r--r--arch/um/os-Linux/aio.c8
-rw-r--r--arch/um/os-Linux/drivers/etap.h2
-rw-r--r--arch/um/os-Linux/drivers/ethertap_kern.c2
-rw-r--r--arch/um/os-Linux/drivers/ethertap_user.c6
-rw-r--r--arch/um/os-Linux/drivers/tuntap.h2
-rw-r--r--arch/um/os-Linux/drivers/tuntap_kern.c2
-rw-r--r--arch/um/os-Linux/drivers/tuntap_user.c4
-rw-r--r--arch/um/os-Linux/elf_aux.c6
-rw-r--r--arch/um/os-Linux/execvp.c4
-rw-r--r--arch/um/os-Linux/file.c2
-rw-r--r--arch/um/os-Linux/helper.c6
-rw-r--r--arch/um/os-Linux/irq.c6
-rw-r--r--arch/um/os-Linux/main.c10
-rw-r--r--arch/um/os-Linux/mem.c4
-rw-r--r--arch/um/os-Linux/process.c8
-rw-r--r--arch/um/os-Linux/registers.c6
-rw-r--r--arch/um/os-Linux/sigio.c10
-rw-r--r--arch/um/os-Linux/signal.c8
-rw-r--r--arch/um/os-Linux/skas/mem.c20
-rw-r--r--arch/um/os-Linux/skas/process.c22
-rw-r--r--arch/um/os-Linux/start_up.c14
-rw-r--r--arch/um/os-Linux/time.c4
-rw-r--r--arch/um/os-Linux/tty.c4
-rw-r--r--arch/um/os-Linux/umid.c4
-rw-r--r--arch/um/os-Linux/user_syms.c4
-rw-r--r--arch/um/os-Linux/util.c2
26 files changed, 85 insertions, 85 deletions
diff --git a/arch/um/os-Linux/aio.c b/arch/um/os-Linux/aio.c
index c5d039e1ff3b..3a6bc2af0961 100644
--- a/arch/um/os-Linux/aio.c
+++ b/arch/um/os-Linux/aio.c
@@ -9,10 +9,10 @@
9#include <errno.h> 9#include <errno.h>
10#include <sys/time.h> 10#include <sys/time.h>
11#include <asm/unistd.h> 11#include <asm/unistd.h>
12#include "aio.h" 12#include <aio.h>
13#include "init.h" 13#include <init.h>
14#include "kern_util.h" 14#include <kern_util.h>
15#include "os.h" 15#include <os.h>
16 16
17struct aio_thread_req { 17struct aio_thread_req {
18 enum aio_type type; 18 enum aio_type type;
diff --git a/arch/um/os-Linux/drivers/etap.h b/arch/um/os-Linux/drivers/etap.h
index ddffd41c3f3f..54183a679fdd 100644
--- a/arch/um/os-Linux/drivers/etap.h
+++ b/arch/um/os-Linux/drivers/etap.h
@@ -6,7 +6,7 @@
6#ifndef __DRIVERS_ETAP_H 6#ifndef __DRIVERS_ETAP_H
7#define __DRIVERS_ETAP_H 7#define __DRIVERS_ETAP_H
8 8
9#include "net_user.h" 9#include <net_user.h>
10 10
11struct ethertap_data { 11struct ethertap_data {
12 char *dev_name; 12 char *dev_name;
diff --git a/arch/um/os-Linux/drivers/ethertap_kern.c b/arch/um/os-Linux/drivers/ethertap_kern.c
index 7f6f9a71aae4..f424600a583f 100644
--- a/arch/um/os-Linux/drivers/ethertap_kern.c
+++ b/arch/um/os-Linux/drivers/ethertap_kern.c
@@ -9,7 +9,7 @@
9#include <linux/init.h> 9#include <linux/init.h>
10#include <linux/netdevice.h> 10#include <linux/netdevice.h>
11#include "etap.h" 11#include "etap.h"
12#include "net_kern.h" 12#include <net_kern.h>
13 13
14struct ethertap_init { 14struct ethertap_init {
15 char *dev_name; 15 char *dev_name;
diff --git a/arch/um/os-Linux/drivers/ethertap_user.c b/arch/um/os-Linux/drivers/ethertap_user.c
index db3d6481375a..b39b6696ac58 100644
--- a/arch/um/os-Linux/drivers/ethertap_user.c
+++ b/arch/um/os-Linux/drivers/ethertap_user.c
@@ -13,9 +13,9 @@
13#include <sys/socket.h> 13#include <sys/socket.h>
14#include <sys/wait.h> 14#include <sys/wait.h>
15#include "etap.h" 15#include "etap.h"
16#include "os.h" 16#include <os.h>
17#include "net_user.h" 17#include <net_user.h>
18#include "um_malloc.h" 18#include <um_malloc.h>
19 19
20#define MAX_PACKET ETH_MAX_PACKET 20#define MAX_PACKET ETH_MAX_PACKET
21 21
diff --git a/arch/um/os-Linux/drivers/tuntap.h b/arch/um/os-Linux/drivers/tuntap.h
index f17c31586c84..7367354ac8df 100644
--- a/arch/um/os-Linux/drivers/tuntap.h
+++ b/arch/um/os-Linux/drivers/tuntap.h
@@ -6,7 +6,7 @@
6#ifndef __UM_TUNTAP_H 6#ifndef __UM_TUNTAP_H
7#define __UM_TUNTAP_H 7#define __UM_TUNTAP_H
8 8
9#include "net_user.h" 9#include <net_user.h>
10 10
11struct tuntap_data { 11struct tuntap_data {
12 char *dev_name; 12 char *dev_name;
diff --git a/arch/um/os-Linux/drivers/tuntap_kern.c b/arch/um/os-Linux/drivers/tuntap_kern.c
index 4048800e4696..d9d56e5810fe 100644
--- a/arch/um/os-Linux/drivers/tuntap_kern.c
+++ b/arch/um/os-Linux/drivers/tuntap_kern.c
@@ -7,7 +7,7 @@
7#include <linux/init.h> 7#include <linux/init.h>
8#include <linux/skbuff.h> 8#include <linux/skbuff.h>
9#include <asm/errno.h> 9#include <asm/errno.h>
10#include "net_kern.h" 10#include <net_kern.h>
11#include "tuntap.h" 11#include "tuntap.h"
12 12
13struct tuntap_init { 13struct tuntap_init {
diff --git a/arch/um/os-Linux/drivers/tuntap_user.c b/arch/um/os-Linux/drivers/tuntap_user.c
index a2aacffdd907..14126d9176aa 100644
--- a/arch/um/os-Linux/drivers/tuntap_user.c
+++ b/arch/um/os-Linux/drivers/tuntap_user.c
@@ -13,8 +13,8 @@
13#include <sys/socket.h> 13#include <sys/socket.h>
14#include <sys/wait.h> 14#include <sys/wait.h>
15#include <sys/uio.h> 15#include <sys/uio.h>
16#include "kern_util.h" 16#include <kern_util.h>
17#include "os.h" 17#include <os.h>
18#include "tuntap.h" 18#include "tuntap.h"
19 19
20static int tuntap_user_init(void *data, void *dev) 20static int tuntap_user_init(void *data, void *dev)
diff --git a/arch/um/os-Linux/elf_aux.c b/arch/um/os-Linux/elf_aux.c
index d895271ad6f7..1a365ddc4d02 100644
--- a/arch/um/os-Linux/elf_aux.c
+++ b/arch/um/os-Linux/elf_aux.c
@@ -9,9 +9,9 @@
9 */ 9 */
10#include <elf.h> 10#include <elf.h>
11#include <stddef.h> 11#include <stddef.h>
12#include "init.h" 12#include <init.h>
13#include "elf_user.h" 13#include <elf_user.h>
14#include "mem_user.h" 14#include <mem_user.h>
15 15
16typedef Elf32_auxv_t elf_auxv_t; 16typedef Elf32_auxv_t elf_auxv_t;
17 17
diff --git a/arch/um/os-Linux/execvp.c b/arch/um/os-Linux/execvp.c
index 66e583a4031b..8fb25ca07c46 100644
--- a/arch/um/os-Linux/execvp.c
+++ b/arch/um/os-Linux/execvp.c
@@ -27,12 +27,12 @@
27#include <limits.h> 27#include <limits.h>
28 28
29#ifndef TEST 29#ifndef TEST
30#include "um_malloc.h" 30#include <um_malloc.h>
31#else 31#else
32#include <stdio.h> 32#include <stdio.h>
33#define um_kmalloc malloc 33#define um_kmalloc malloc
34#endif 34#endif
35#include "os.h" 35#include <os.h>
36 36
37/* Execute FILE, searching in the `PATH' environment variable if it contains 37/* Execute FILE, searching in the `PATH' environment variable if it contains
38 no slashes, with arguments ARGV and environment from `environ'. */ 38 no slashes, with arguments ARGV and environment from `environ'. */
diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
index b049a63bb74b..c17bd6f7d674 100644
--- a/arch/um/os-Linux/file.c
+++ b/arch/um/os-Linux/file.c
@@ -13,7 +13,7 @@
13#include <sys/socket.h> 13#include <sys/socket.h>
14#include <sys/stat.h> 14#include <sys/stat.h>
15#include <sys/un.h> 15#include <sys/un.h>
16#include "os.h" 16#include <os.h>
17 17
18static void copy_stat(struct uml_stat *dst, const struct stat64 *src) 18static void copy_stat(struct uml_stat *dst, const struct stat64 *src)
19{ 19{
diff --git a/arch/um/os-Linux/helper.c b/arch/um/os-Linux/helper.c
index cf26c4a9a43a..e3ee4a51ef63 100644
--- a/arch/um/os-Linux/helper.c
+++ b/arch/um/os-Linux/helper.c
@@ -10,9 +10,9 @@
10#include <linux/limits.h> 10#include <linux/limits.h>
11#include <sys/socket.h> 11#include <sys/socket.h>
12#include <sys/wait.h> 12#include <sys/wait.h>
13#include "kern_util.h" 13#include <kern_util.h>
14#include "os.h" 14#include <os.h>
15#include "um_malloc.h" 15#include <um_malloc.h>
16 16
17struct helper_data { 17struct helper_data {
18 void (*pre_exec)(void*); 18 void (*pre_exec)(void*);
diff --git a/arch/um/os-Linux/irq.c b/arch/um/os-Linux/irq.c
index 9a49908b576c..b9afb74b79ad 100644
--- a/arch/um/os-Linux/irq.c
+++ b/arch/um/os-Linux/irq.c
@@ -8,9 +8,9 @@
8#include <poll.h> 8#include <poll.h>
9#include <signal.h> 9#include <signal.h>
10#include <string.h> 10#include <string.h>
11#include "irq_user.h" 11#include <irq_user.h>
12#include "os.h" 12#include <os.h>
13#include "um_malloc.h" 13#include <um_malloc.h>
14 14
15/* 15/*
16 * Locked by irq_lock in arch/um/kernel/irq.c. Changed by os_create_pollfd 16 * Locked by irq_lock in arch/um/kernel/irq.c. Changed by os_create_pollfd
diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c
index 7a86dd516eb1..749c96da7b99 100644
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
@@ -10,11 +10,11 @@
10#include <signal.h> 10#include <signal.h>
11#include <string.h> 11#include <string.h>
12#include <sys/resource.h> 12#include <sys/resource.h>
13#include "as-layout.h" 13#include <as-layout.h>
14#include "init.h" 14#include <init.h>
15#include "kern_util.h" 15#include <kern_util.h>
16#include "os.h" 16#include <os.h>
17#include "um_malloc.h" 17#include <um_malloc.h>
18 18
19#define PGD_BOUND (4 * 1024 * 1024) 19#define PGD_BOUND (4 * 1024 * 1024)
20#define STACKSIZE (8 * 1024 * 1024) 20#define STACKSIZE (8 * 1024 * 1024)
diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
index 8e421e1d6d36..ba4398056fe9 100644
--- a/arch/um/os-Linux/mem.c
+++ b/arch/um/os-Linux/mem.c
@@ -13,8 +13,8 @@
13#include <sys/stat.h> 13#include <sys/stat.h>
14#include <sys/mman.h> 14#include <sys/mman.h>
15#include <sys/param.h> 15#include <sys/param.h>
16#include "init.h" 16#include <init.h>
17#include "os.h" 17#include <os.h>
18 18
19/* Modified by which_tmpdir, which is called during early boot */ 19/* Modified by which_tmpdir, which is called during early boot */
20static char *default_tmpdir = "/tmp"; 20static char *default_tmpdir = "/tmp";
diff --git a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c
index 307f173e7f82..162bea3d91b2 100644
--- a/arch/um/os-Linux/process.c
+++ b/arch/um/os-Linux/process.c
@@ -12,10 +12,10 @@
12#include <sys/ptrace.h> 12#include <sys/ptrace.h>
13#include <sys/wait.h> 13#include <sys/wait.h>
14#include <asm/unistd.h> 14#include <asm/unistd.h>
15#include "init.h" 15#include <init.h>
16#include "longjmp.h" 16#include <longjmp.h>
17#include "os.h" 17#include <os.h>
18#include "skas_ptrace.h" 18#include <skas_ptrace.h>
19 19
20#define ARBITRARY_ADDR -1 20#define ARBITRARY_ADDR -1
21#define FAILURE_PID -1 21#define FAILURE_PID -1
diff --git a/arch/um/os-Linux/registers.c b/arch/um/os-Linux/registers.c
index b866b9e3bef9..2ff8d4fe83c4 100644
--- a/arch/um/os-Linux/registers.c
+++ b/arch/um/os-Linux/registers.c
@@ -7,9 +7,9 @@
7#include <errno.h> 7#include <errno.h>
8#include <string.h> 8#include <string.h>
9#include <sys/ptrace.h> 9#include <sys/ptrace.h>
10#include "sysdep/ptrace.h" 10#include <sysdep/ptrace.h>
11#include "sysdep/ptrace_user.h" 11#include <sysdep/ptrace_user.h>
12#include "registers.h" 12#include <registers.h>
13 13
14int save_registers(int pid, struct uml_pt_regs *regs) 14int save_registers(int pid, struct uml_pt_regs *regs)
15{ 15{
diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c
index 3c161218c671..8b61cc0e82c8 100644
--- a/arch/um/os-Linux/sigio.c
+++ b/arch/um/os-Linux/sigio.c
@@ -11,11 +11,11 @@
11#include <sched.h> 11#include <sched.h>
12#include <signal.h> 12#include <signal.h>
13#include <string.h> 13#include <string.h>
14#include "kern_util.h" 14#include <kern_util.h>
15#include "init.h" 15#include <init.h>
16#include "os.h" 16#include <os.h>
17#include "sigio.h" 17#include <sigio.h>
18#include "um_malloc.h" 18#include <um_malloc.h>
19 19
20/* 20/*
21 * Protected by sigio_lock(), also used by sigio_cleanup, which is an 21 * Protected by sigio_lock(), also used by sigio_cleanup, which is an
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index 6366ce904b9b..b1469fe93295 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -9,10 +9,10 @@
9#include <errno.h> 9#include <errno.h>
10#include <signal.h> 10#include <signal.h>
11#include <strings.h> 11#include <strings.h>
12#include "as-layout.h" 12#include <as-layout.h>
13#include "kern_util.h" 13#include <kern_util.h>
14#include "os.h" 14#include <os.h>
15#include "sysdep/mcontext.h" 15#include <sysdep/mcontext.h>
16#include "internal.h" 16#include "internal.h"
17 17
18void (*sig_info[NSIG])(int, siginfo_t *, struct uml_pt_regs *) = { 18void (*sig_info[NSIG])(int, siginfo_t *, struct uml_pt_regs *) = {
diff --git a/arch/um/os-Linux/skas/mem.c b/arch/um/os-Linux/skas/mem.c
index 90b310d29179..689b18db798f 100644
--- a/arch/um/os-Linux/skas/mem.c
+++ b/arch/um/os-Linux/skas/mem.c
@@ -8,16 +8,16 @@
8#include <errno.h> 8#include <errno.h>
9#include <string.h> 9#include <string.h>
10#include <sys/mman.h> 10#include <sys/mman.h>
11#include "init.h" 11#include <init.h>
12#include "as-layout.h" 12#include <as-layout.h>
13#include "mm_id.h" 13#include <mm_id.h>
14#include "os.h" 14#include <os.h>
15#include "proc_mm.h" 15#include <proc_mm.h>
16#include "ptrace_user.h" 16#include <ptrace_user.h>
17#include "registers.h" 17#include <registers.h>
18#include "skas.h" 18#include <skas.h>
19#include "sysdep/ptrace.h" 19#include <sysdep/ptrace.h>
20#include "sysdep/stub.h" 20#include <sysdep/stub.h>
21 21
22extern unsigned long batch_syscall_stub, __syscall_stub_start; 22extern unsigned long batch_syscall_stub, __syscall_stub_start;
23 23
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index d93bb40499f7..4625949bf1e4 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -11,17 +11,17 @@
11#include <sys/mman.h> 11#include <sys/mman.h>
12#include <sys/wait.h> 12#include <sys/wait.h>
13#include <asm/unistd.h> 13#include <asm/unistd.h>
14#include "as-layout.h" 14#include <as-layout.h>
15#include "init.h" 15#include <init.h>
16#include "kern_util.h" 16#include <kern_util.h>
17#include "mem.h" 17#include <mem.h>
18#include "os.h" 18#include <os.h>
19#include "proc_mm.h" 19#include <proc_mm.h>
20#include "ptrace_user.h" 20#include <ptrace_user.h>
21#include "registers.h" 21#include <registers.h>
22#include "skas.h" 22#include <skas.h>
23#include "skas_ptrace.h" 23#include <skas_ptrace.h>
24#include "sysdep/stub.h" 24#include <sysdep/stub.h>
25 25
26int is_skas_winch(int pid, int fd, void *data) 26int is_skas_winch(int pid, int fd, void *data)
27{ 27{
diff --git a/arch/um/os-Linux/start_up.c b/arch/um/os-Linux/start_up.c
index 425162e22af5..da4b9e9999fd 100644
--- a/arch/um/os-Linux/start_up.c
+++ b/arch/um/os-Linux/start_up.c
@@ -16,13 +16,13 @@
16#include <sys/stat.h> 16#include <sys/stat.h>
17#include <sys/wait.h> 17#include <sys/wait.h>
18#include <asm/unistd.h> 18#include <asm/unistd.h>
19#include "init.h" 19#include <init.h>
20#include "os.h" 20#include <os.h>
21#include "mem_user.h" 21#include <mem_user.h>
22#include "ptrace_user.h" 22#include <ptrace_user.h>
23#include "registers.h" 23#include <registers.h>
24#include "skas.h" 24#include <skas.h>
25#include "skas_ptrace.h" 25#include <skas_ptrace.h>
26 26
27static void ptrace_child(void) 27static void ptrace_child(void)
28{ 28{
diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c
index 0748fe0c8a73..fac388cb464f 100644
--- a/arch/um/os-Linux/time.c
+++ b/arch/um/os-Linux/time.c
@@ -8,8 +8,8 @@
8#include <signal.h> 8#include <signal.h>
9#include <time.h> 9#include <time.h>
10#include <sys/time.h> 10#include <sys/time.h>
11#include "kern_util.h" 11#include <kern_util.h>
12#include "os.h" 12#include <os.h>
13#include "internal.h" 13#include "internal.h"
14 14
15int set_interval(void) 15int set_interval(void)
diff --git a/arch/um/os-Linux/tty.c b/arch/um/os-Linux/tty.c
index dd12b99dcb59..721d8afa329b 100644
--- a/arch/um/os-Linux/tty.c
+++ b/arch/um/os-Linux/tty.c
@@ -7,8 +7,8 @@
7#include <unistd.h> 7#include <unistd.h>
8#include <errno.h> 8#include <errno.h>
9#include <fcntl.h> 9#include <fcntl.h>
10#include "kern_util.h" 10#include <kern_util.h>
11#include "os.h" 11#include <os.h>
12 12
13struct grantpt_info { 13struct grantpt_info {
14 int fd; 14 int fd;
diff --git a/arch/um/os-Linux/umid.c b/arch/um/os-Linux/umid.c
index 4832eb519f8d..c1dc89261f67 100644
--- a/arch/um/os-Linux/umid.c
+++ b/arch/um/os-Linux/umid.c
@@ -12,8 +12,8 @@
12#include <string.h> 12#include <string.h>
13#include <unistd.h> 13#include <unistd.h>
14#include <sys/stat.h> 14#include <sys/stat.h>
15#include "init.h" 15#include <init.h>
16#include "os.h" 16#include <os.h>
17 17
18#define UML_DIR "~/.uml/" 18#define UML_DIR "~/.uml/"
19 19
diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c
index 73926fa3f96b..db4a034aeee1 100644
--- a/arch/um/os-Linux/user_syms.c
+++ b/arch/um/os-Linux/user_syms.c
@@ -1,5 +1,5 @@
1#include "linux/types.h" 1#include <linux/types.h>
2#include "linux/module.h" 2#include <linux/module.h>
3 3
4/* Some of this are builtin function (some are not but could in the future), 4/* Some of this are builtin function (some are not but could in the future),
5 * so I *must* declare good prototypes for them and then EXPORT them. 5 * so I *must* declare good prototypes for them and then EXPORT them.
diff --git a/arch/um/os-Linux/util.c b/arch/um/os-Linux/util.c
index 9e3b43bb84c9..492ef5e6e166 100644
--- a/arch/um/os-Linux/util.c
+++ b/arch/um/os-Linux/util.c
@@ -13,7 +13,7 @@
13#include <wait.h> 13#include <wait.h>
14#include <sys/mman.h> 14#include <sys/mman.h>
15#include <sys/utsname.h> 15#include <sys/utsname.h>
16#include "os.h" 16#include <os.h>
17 17
18void stack_protections(unsigned long address) 18void stack_protections(unsigned long address)
19{ 19{