diff options
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/drivers/daemon_kern.c | 2 | ||||
-rw-r--r-- | arch/um/drivers/line.c | 6 | ||||
-rw-r--r-- | arch/um/drivers/mcast_kern.c | 2 | ||||
-rw-r--r-- | arch/um/drivers/pcap_kern.c | 2 | ||||
-rw-r--r-- | arch/um/drivers/slip_kern.c | 2 | ||||
-rw-r--r-- | arch/um/drivers/slirp_kern.c | 2 | ||||
-rw-r--r-- | arch/um/include/chan_kern.h | 2 | ||||
-rw-r--r-- | arch/um/include/line.h | 2 | ||||
-rw-r--r-- | arch/um/include/sysdep-i386/ptrace.h | 2 | ||||
-rw-r--r-- | arch/um/include/sysdep-i386/stub.h | 1 | ||||
-rw-r--r-- | arch/um/include/sysdep-x86_64/ptrace.h | 2 | ||||
-rw-r--r-- | arch/um/os-Linux/drivers/ethertap_kern.c | 2 | ||||
-rw-r--r-- | arch/um/os-Linux/drivers/tuntap_kern.c | 2 | ||||
-rw-r--r-- | arch/um/sys-i386/ldt.c | 1 | ||||
-rw-r--r-- | arch/um/sys-i386/ptrace_user.c | 2 | ||||
-rw-r--r-- | arch/um/sys-i386/user-offsets.c | 2 |
16 files changed, 17 insertions, 17 deletions
diff --git a/arch/um/drivers/daemon_kern.c b/arch/um/drivers/daemon_kern.c index 824386974f88..9c2e7a758f21 100644 --- a/arch/um/drivers/daemon_kern.c +++ b/arch/um/drivers/daemon_kern.c | |||
@@ -98,4 +98,4 @@ static int register_daemon(void) | |||
98 | return 0; | 98 | return 0; |
99 | } | 99 | } |
100 | 100 | ||
101 | __initcall(register_daemon); | 101 | late_initcall(register_daemon); |
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 426633e5d6e3..aa3090d05a8f 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c | |||
@@ -31,9 +31,9 @@ static irqreturn_t line_interrupt(int irq, void *data) | |||
31 | return IRQ_HANDLED; | 31 | return IRQ_HANDLED; |
32 | } | 32 | } |
33 | 33 | ||
34 | static void line_timer_cb(void *arg) | 34 | static void line_timer_cb(struct work_struct *work) |
35 | { | 35 | { |
36 | struct line *line = arg; | 36 | struct line *line = container_of(work, struct line, task.work); |
37 | 37 | ||
38 | if(!line->throttled) | 38 | if(!line->throttled) |
39 | chan_interrupt(&line->chan_list, &line->task, line->tty, | 39 | chan_interrupt(&line->chan_list, &line->task, line->tty, |
@@ -443,7 +443,7 @@ int line_open(struct line *lines, struct tty_struct *tty) | |||
443 | * is registered. | 443 | * is registered. |
444 | */ | 444 | */ |
445 | enable_chan(line); | 445 | enable_chan(line); |
446 | INIT_WORK(&line->task, line_timer_cb, line); | 446 | INIT_DELAYED_WORK(&line->task, line_timer_cb); |
447 | 447 | ||
448 | if(!line->sigio){ | 448 | if(!line->sigio){ |
449 | chan_enable_winch(&line->chan_list, tty); | 449 | chan_enable_winch(&line->chan_list, tty); |
diff --git a/arch/um/drivers/mcast_kern.c b/arch/um/drivers/mcast_kern.c index c090fbd464e7..52ccb7b53cd2 100644 --- a/arch/um/drivers/mcast_kern.c +++ b/arch/um/drivers/mcast_kern.c | |||
@@ -127,4 +127,4 @@ static int register_mcast(void) | |||
127 | return 0; | 127 | return 0; |
128 | } | 128 | } |
129 | 129 | ||
130 | __initcall(register_mcast); | 130 | late_initcall(register_mcast); |
diff --git a/arch/um/drivers/pcap_kern.c b/arch/um/drivers/pcap_kern.c index 6e1ef8558283..e67362acf0e7 100644 --- a/arch/um/drivers/pcap_kern.c +++ b/arch/um/drivers/pcap_kern.c | |||
@@ -109,4 +109,4 @@ static int register_pcap(void) | |||
109 | return 0; | 109 | return 0; |
110 | } | 110 | } |
111 | 111 | ||
112 | __initcall(register_pcap); | 112 | late_initcall(register_pcap); |
diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c index 788da5439a2d..25634bd1f585 100644 --- a/arch/um/drivers/slip_kern.c +++ b/arch/um/drivers/slip_kern.c | |||
@@ -95,4 +95,4 @@ static int register_slip(void) | |||
95 | return 0; | 95 | return 0; |
96 | } | 96 | } |
97 | 97 | ||
98 | __initcall(register_slip); | 98 | late_initcall(register_slip); |
diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c index ae322e1c8a87..b3ed8fb874ab 100644 --- a/arch/um/drivers/slirp_kern.c +++ b/arch/um/drivers/slirp_kern.c | |||
@@ -119,4 +119,4 @@ static int register_slirp(void) | |||
119 | return 0; | 119 | return 0; |
120 | } | 120 | } |
121 | 121 | ||
122 | __initcall(register_slirp); | 122 | late_initcall(register_slirp); |
diff --git a/arch/um/include/chan_kern.h b/arch/um/include/chan_kern.h index 572d286ed2c6..9003a343e148 100644 --- a/arch/um/include/chan_kern.h +++ b/arch/um/include/chan_kern.h | |||
@@ -27,7 +27,7 @@ struct chan { | |||
27 | void *data; | 27 | void *data; |
28 | }; | 28 | }; |
29 | 29 | ||
30 | extern void chan_interrupt(struct list_head *chans, struct work_struct *task, | 30 | extern void chan_interrupt(struct list_head *chans, struct delayed_work *task, |
31 | struct tty_struct *tty, int irq); | 31 | struct tty_struct *tty, int irq); |
32 | extern int parse_chan_pair(char *str, struct line *line, int device, | 32 | extern int parse_chan_pair(char *str, struct line *line, int device, |
33 | const struct chan_opts *opts); | 33 | const struct chan_opts *opts); |
diff --git a/arch/um/include/line.h b/arch/um/include/line.h index 7be24811bb30..214ee76c40df 100644 --- a/arch/um/include/line.h +++ b/arch/um/include/line.h | |||
@@ -51,7 +51,7 @@ struct line { | |||
51 | char *tail; | 51 | char *tail; |
52 | 52 | ||
53 | int sigio; | 53 | int sigio; |
54 | struct work_struct task; | 54 | struct delayed_work task; |
55 | const struct line_driver *driver; | 55 | const struct line_driver *driver; |
56 | int have_irq; | 56 | int have_irq; |
57 | }; | 57 | }; |
diff --git a/arch/um/include/sysdep-i386/ptrace.h b/arch/um/include/sysdep-i386/ptrace.h index 6670cc992ecb..52b398bcafcf 100644 --- a/arch/um/include/sysdep-i386/ptrace.h +++ b/arch/um/include/sysdep-i386/ptrace.h | |||
@@ -75,7 +75,7 @@ union uml_pt_regs { | |||
75 | #endif | 75 | #endif |
76 | #ifdef UML_CONFIG_MODE_SKAS | 76 | #ifdef UML_CONFIG_MODE_SKAS |
77 | struct skas_regs { | 77 | struct skas_regs { |
78 | unsigned long regs[HOST_FRAME_SIZE]; | 78 | unsigned long regs[MAX_REG_NR]; |
79 | unsigned long fp[HOST_FP_SIZE]; | 79 | unsigned long fp[HOST_FP_SIZE]; |
80 | unsigned long xfp[HOST_XFP_SIZE]; | 80 | unsigned long xfp[HOST_XFP_SIZE]; |
81 | struct faultinfo faultinfo; | 81 | struct faultinfo faultinfo; |
diff --git a/arch/um/include/sysdep-i386/stub.h b/arch/um/include/sysdep-i386/stub.h index b492b12b4a10..4fffae75ba53 100644 --- a/arch/um/include/sysdep-i386/stub.h +++ b/arch/um/include/sysdep-i386/stub.h | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <sys/mman.h> | 9 | #include <sys/mman.h> |
10 | #include <asm/ptrace.h> | 10 | #include <asm/ptrace.h> |
11 | #include <asm/unistd.h> | 11 | #include <asm/unistd.h> |
12 | #include <asm/page.h> | ||
12 | #include "stub-data.h" | 13 | #include "stub-data.h" |
13 | #include "kern_constants.h" | 14 | #include "kern_constants.h" |
14 | #include "uml-config.h" | 15 | #include "uml-config.h" |
diff --git a/arch/um/include/sysdep-x86_64/ptrace.h b/arch/um/include/sysdep-x86_64/ptrace.h index 617bb9efc934..66cb400c2c92 100644 --- a/arch/um/include/sysdep-x86_64/ptrace.h +++ b/arch/um/include/sysdep-x86_64/ptrace.h | |||
@@ -108,7 +108,7 @@ union uml_pt_regs { | |||
108 | * file size, while i386 uses FRAME_SIZE. Therefore, we need | 108 | * file size, while i386 uses FRAME_SIZE. Therefore, we need |
109 | * to use UM_FRAME_SIZE here instead of HOST_FRAME_SIZE. | 109 | * to use UM_FRAME_SIZE here instead of HOST_FRAME_SIZE. |
110 | */ | 110 | */ |
111 | unsigned long regs[UM_FRAME_SIZE]; | 111 | unsigned long regs[MAX_REG_NR]; |
112 | unsigned long fp[HOST_FP_SIZE]; | 112 | unsigned long fp[HOST_FP_SIZE]; |
113 | struct faultinfo faultinfo; | 113 | struct faultinfo faultinfo; |
114 | long syscall; | 114 | long syscall; |
diff --git a/arch/um/os-Linux/drivers/ethertap_kern.c b/arch/um/os-Linux/drivers/ethertap_kern.c index 16385e2ada85..70541821775f 100644 --- a/arch/um/os-Linux/drivers/ethertap_kern.c +++ b/arch/um/os-Linux/drivers/ethertap_kern.c | |||
@@ -105,4 +105,4 @@ static int register_ethertap(void) | |||
105 | return 0; | 105 | return 0; |
106 | } | 106 | } |
107 | 107 | ||
108 | __initcall(register_ethertap); | 108 | late_initcall(register_ethertap); |
diff --git a/arch/um/os-Linux/drivers/tuntap_kern.c b/arch/um/os-Linux/drivers/tuntap_kern.c index 0edbac63c527..76570a2c25c3 100644 --- a/arch/um/os-Linux/drivers/tuntap_kern.c +++ b/arch/um/os-Linux/drivers/tuntap_kern.c | |||
@@ -90,4 +90,4 @@ static int register_tuntap(void) | |||
90 | return 0; | 90 | return 0; |
91 | } | 91 | } |
92 | 92 | ||
93 | __initcall(register_tuntap); | 93 | late_initcall(register_tuntap); |
diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c index e299ee5a753d..49057d8bc668 100644 --- a/arch/um/sys-i386/ldt.c +++ b/arch/um/sys-i386/ldt.c | |||
@@ -3,7 +3,6 @@ | |||
3 | * Licensed under the GPL | 3 | * Licensed under the GPL |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "linux/stddef.h" | ||
7 | #include "linux/sched.h" | 6 | #include "linux/sched.h" |
8 | #include "linux/slab.h" | 7 | #include "linux/slab.h" |
9 | #include "linux/types.h" | 8 | #include "linux/types.h" |
diff --git a/arch/um/sys-i386/ptrace_user.c b/arch/um/sys-i386/ptrace_user.c index 5f3cc6685820..01212c88fcc4 100644 --- a/arch/um/sys-i386/ptrace_user.c +++ b/arch/um/sys-i386/ptrace_user.c | |||
@@ -4,9 +4,9 @@ | |||
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <stdio.h> | 6 | #include <stdio.h> |
7 | #include <stddef.h> | ||
7 | #include <errno.h> | 8 | #include <errno.h> |
8 | #include <unistd.h> | 9 | #include <unistd.h> |
9 | #include <linux/stddef.h> | ||
10 | #include "ptrace_user.h" | 10 | #include "ptrace_user.h" |
11 | /* Grr, asm/user.h includes asm/ptrace.h, so has to follow ptrace_user.h */ | 11 | /* Grr, asm/user.h includes asm/ptrace.h, so has to follow ptrace_user.h */ |
12 | #include <asm/user.h> | 12 | #include <asm/user.h> |
diff --git a/arch/um/sys-i386/user-offsets.c b/arch/um/sys-i386/user-offsets.c index 6f4ef2b7fa4a..447306b20aea 100644 --- a/arch/um/sys-i386/user-offsets.c +++ b/arch/um/sys-i386/user-offsets.c | |||
@@ -2,7 +2,7 @@ | |||
2 | #include <signal.h> | 2 | #include <signal.h> |
3 | #include <asm/ptrace.h> | 3 | #include <asm/ptrace.h> |
4 | #include <asm/user.h> | 4 | #include <asm/user.h> |
5 | #include <linux/stddef.h> | 5 | #include <stddef.h> |
6 | #include <sys/poll.h> | 6 | #include <sys/poll.h> |
7 | 7 | ||
8 | #define DEFINE(sym, val) \ | 8 | #define DEFINE(sym, val) \ |