diff options
Diffstat (limited to 'arch/um/kernel')
-rw-r--r-- | arch/um/kernel/irq.c | 6 | ||||
-rw-r--r-- | arch/um/kernel/ksyms.c | 1 | ||||
-rw-r--r-- | arch/um/kernel/smp.c | 6 |
3 files changed, 4 insertions, 9 deletions
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index ba11ccd6a8a3..91587f8db340 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c | |||
@@ -107,10 +107,9 @@ int activate_fd(int irq, int fd, int type, void *dev_id) | |||
107 | struct pollfd *tmp_pfd; | 107 | struct pollfd *tmp_pfd; |
108 | struct irq_fd *new_fd, *irq_fd; | 108 | struct irq_fd *new_fd, *irq_fd; |
109 | unsigned long flags; | 109 | unsigned long flags; |
110 | int pid, events, err, n; | 110 | int events, err, n; |
111 | 111 | ||
112 | pid = os_getpid(); | 112 | err = os_set_fd_async(fd); |
113 | err = os_set_fd_async(fd, pid); | ||
114 | if (err < 0) | 113 | if (err < 0) |
115 | goto out; | 114 | goto out; |
116 | 115 | ||
@@ -127,7 +126,6 @@ int activate_fd(int irq, int fd, int type, void *dev_id) | |||
127 | .fd = fd, | 126 | .fd = fd, |
128 | .type = type, | 127 | .type = type, |
129 | .irq = irq, | 128 | .irq = irq, |
130 | .pid = pid, | ||
131 | .events = events, | 129 | .events = events, |
132 | .current_events = 0 } ); | 130 | .current_events = 0 } ); |
133 | 131 | ||
diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c index 187a756f3e5b..5311ee93ede3 100644 --- a/arch/um/kernel/ksyms.c +++ b/arch/um/kernel/ksyms.c | |||
@@ -36,7 +36,6 @@ EXPORT_SYMBOL(uml_strdup); | |||
36 | EXPORT_SYMBOL(os_stat_fd); | 36 | EXPORT_SYMBOL(os_stat_fd); |
37 | EXPORT_SYMBOL(os_stat_file); | 37 | EXPORT_SYMBOL(os_stat_file); |
38 | EXPORT_SYMBOL(os_access); | 38 | EXPORT_SYMBOL(os_access); |
39 | EXPORT_SYMBOL(os_get_exec_close); | ||
40 | EXPORT_SYMBOL(os_set_exec_close); | 39 | EXPORT_SYMBOL(os_set_exec_close); |
41 | EXPORT_SYMBOL(os_getpid); | 40 | EXPORT_SYMBOL(os_getpid); |
42 | EXPORT_SYMBOL(os_open_file); | 41 | EXPORT_SYMBOL(os_open_file); |
diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c index a12e5bd15790..869ac6802209 100644 --- a/arch/um/kernel/smp.c +++ b/arch/um/kernel/smp.c | |||
@@ -74,8 +74,7 @@ static int idle_proc(void *cpup) | |||
74 | if (err < 0) | 74 | if (err < 0) |
75 | panic("CPU#%d failed to create IPI pipe, err = %d", cpu, -err); | 75 | panic("CPU#%d failed to create IPI pipe, err = %d", cpu, -err); |
76 | 76 | ||
77 | os_set_fd_async(cpu_data[cpu].ipi_pipe[0], | 77 | os_set_fd_async(cpu_data[cpu].ipi_pipe[0]); |
78 | current->thread.mode.tt.extern_pid); | ||
79 | 78 | ||
80 | wmb(); | 79 | wmb(); |
81 | if (cpu_test_and_set(cpu, cpu_callin_map)) { | 80 | if (cpu_test_and_set(cpu, cpu_callin_map)) { |
@@ -128,8 +127,7 @@ void smp_prepare_cpus(unsigned int maxcpus) | |||
128 | if (err < 0) | 127 | if (err < 0) |
129 | panic("CPU#0 failed to create IPI pipe, errno = %d", -err); | 128 | panic("CPU#0 failed to create IPI pipe, errno = %d", -err); |
130 | 129 | ||
131 | os_set_fd_async(cpu_data[me].ipi_pipe[0], | 130 | os_set_fd_async(cpu_data[me].ipi_pipe[0]); |
132 | current->thread.mode.tt.extern_pid); | ||
133 | 131 | ||
134 | for (cpu = 1; cpu < ncpus; cpu++) { | 132 | for (cpu = 1; cpu < ncpus; cpu++) { |
135 | printk(KERN_INFO "Booting processor %d...\n", cpu); | 133 | printk(KERN_INFO "Booting processor %d...\n", cpu); |