diff options
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/include/skas/skas.h | 1 | ||||
-rw-r--r-- | arch/um/include/um_uaccess.h | 1 | ||||
-rw-r--r-- | arch/um/kernel/physmem.c | 2 | ||||
-rw-r--r-- | arch/um/kernel/ptrace.c | 2 | ||||
-rw-r--r-- | arch/um/kernel/time.c | 8 | ||||
-rw-r--r-- | arch/um/kernel/uaccess.c | 2 | ||||
-rw-r--r-- | arch/um/os-Linux/sigio.c | 2 | ||||
-rw-r--r-- | arch/um/os-Linux/signal.c | 2 | ||||
-rw-r--r-- | arch/um/os-Linux/skas/process.c | 2 | ||||
-rw-r--r-- | arch/um/os-Linux/umid.c | 2 | ||||
-rw-r--r-- | arch/um/sys-i386/bugs.c | 2 | ||||
-rw-r--r-- | arch/um/sys-i386/checksum.S | 5 | ||||
-rw-r--r-- | arch/um/sys-i386/ldt.c | 4 |
13 files changed, 12 insertions, 23 deletions
diff --git a/arch/um/include/skas/skas.h b/arch/um/include/skas/skas.h index b073f8a86bd3..64d2c7443306 100644 --- a/arch/um/include/skas/skas.h +++ b/arch/um/include/skas/skas.h | |||
@@ -16,7 +16,6 @@ extern int user_thread(unsigned long stack, int flags); | |||
16 | extern void new_thread_handler(void); | 16 | extern void new_thread_handler(void); |
17 | extern void handle_syscall(struct uml_pt_regs *regs); | 17 | extern void handle_syscall(struct uml_pt_regs *regs); |
18 | extern int new_mm(unsigned long stack); | 18 | extern int new_mm(unsigned long stack); |
19 | extern void get_skas_faultinfo(int pid, struct faultinfo * fi); | ||
20 | extern long execute_syscall_skas(void *r); | 19 | extern long execute_syscall_skas(void *r); |
21 | extern unsigned long current_stub_stack(void); | 20 | extern unsigned long current_stub_stack(void); |
22 | 21 | ||
diff --git a/arch/um/include/um_uaccess.h b/arch/um/include/um_uaccess.h index 2b6fc8e0f071..45c04999d670 100644 --- a/arch/um/include/um_uaccess.h +++ b/arch/um/include/um_uaccess.h | |||
@@ -34,7 +34,6 @@ extern int copy_to_user(void __user *to, const void *from, int n); | |||
34 | 34 | ||
35 | extern int __do_copy_to_user(void *to, const void *from, int n, | 35 | extern int __do_copy_to_user(void *to, const void *from, int n, |
36 | void **fault_addr, jmp_buf **fault_catcher); | 36 | void **fault_addr, jmp_buf **fault_catcher); |
37 | extern void __do_copy(void *to, const void *from, int n); | ||
38 | 37 | ||
39 | /* | 38 | /* |
40 | * strncpy_from_user: - Copy a NUL terminated string from userspace. | 39 | * strncpy_from_user: - Copy a NUL terminated string from userspace. |
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c index 9757085a0220..a1a9090254c2 100644 --- a/arch/um/kernel/physmem.c +++ b/arch/um/kernel/physmem.c | |||
@@ -185,7 +185,7 @@ unsigned long find_iomem(char *driver, unsigned long *len_out) | |||
185 | return 0; | 185 | return 0; |
186 | } | 186 | } |
187 | 187 | ||
188 | int setup_iomem(void) | 188 | static int setup_iomem(void) |
189 | { | 189 | { |
190 | struct iomem_region *region = iomem_regions; | 190 | struct iomem_region *region = iomem_regions; |
191 | unsigned long iomem_start = high_physmem + PAGE_SIZE; | 191 | unsigned long iomem_start = high_physmem + PAGE_SIZE; |
diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c index 47b57b497d55..15e8b7c4de13 100644 --- a/arch/um/kernel/ptrace.c +++ b/arch/um/kernel/ptrace.c | |||
@@ -225,7 +225,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
225 | return ret; | 225 | return ret; |
226 | } | 226 | } |
227 | 227 | ||
228 | void send_sigtrap(struct task_struct *tsk, struct uml_pt_regs *regs, | 228 | static void send_sigtrap(struct task_struct *tsk, struct uml_pt_regs *regs, |
229 | int error_code) | 229 | int error_code) |
230 | { | 230 | { |
231 | struct siginfo info; | 231 | struct siginfo info; |
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index c3e2f369c33c..47f04f4a3464 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c | |||
@@ -13,14 +13,6 @@ | |||
13 | #include "kern_util.h" | 13 | #include "kern_util.h" |
14 | #include "os.h" | 14 | #include "os.h" |
15 | 15 | ||
16 | /* | ||
17 | * Scheduler clock - returns current time in nanosec units. | ||
18 | */ | ||
19 | unsigned long long sched_clock(void) | ||
20 | { | ||
21 | return (unsigned long long)jiffies_64 * (NSEC_PER_SEC / HZ); | ||
22 | } | ||
23 | |||
24 | void timer_handler(int sig, struct uml_pt_regs *regs) | 16 | void timer_handler(int sig, struct uml_pt_regs *regs) |
25 | { | 17 | { |
26 | unsigned long flags; | 18 | unsigned long flags; |
diff --git a/arch/um/kernel/uaccess.c b/arch/um/kernel/uaccess.c index f0f4b040d7c5..dd33f040c526 100644 --- a/arch/um/kernel/uaccess.c +++ b/arch/um/kernel/uaccess.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/string.h> | 12 | #include <linux/string.h> |
13 | #include "os.h" | 13 | #include "os.h" |
14 | 14 | ||
15 | void __do_copy(void *to, const void *from, int n) | 15 | static void __do_copy(void *to, const void *from, int n) |
16 | { | 16 | { |
17 | memcpy(to, from, n); | 17 | memcpy(to, from, n); |
18 | } | 18 | } |
diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c index eb8f2e4be192..63d299df152b 100644 --- a/arch/um/os-Linux/sigio.c +++ b/arch/um/os-Linux/sigio.c | |||
@@ -530,7 +530,7 @@ static void tty_close(int master, int slave) | |||
530 | printk(UM_KERN_CONT "No, enabling workaround\n"); | 530 | printk(UM_KERN_CONT "No, enabling workaround\n"); |
531 | } | 531 | } |
532 | 532 | ||
533 | void __init check_sigio(void) | 533 | static void __init check_sigio(void) |
534 | { | 534 | { |
535 | if ((access("/dev/ptmx", R_OK) < 0) && | 535 | if ((access("/dev/ptmx", R_OK) < 0) && |
536 | (access("/dev/ptyp0", R_OK) < 0)) { | 536 | (access("/dev/ptyp0", R_OK) < 0)) { |
diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c index 5aade6027e40..6ae180703a63 100644 --- a/arch/um/os-Linux/signal.c +++ b/arch/um/os-Linux/signal.c | |||
@@ -126,7 +126,7 @@ void set_sigstack(void *sig_stack, int size) | |||
126 | panic("enabling signal stack failed, errno = %d\n", errno); | 126 | panic("enabling signal stack failed, errno = %d\n", errno); |
127 | } | 127 | } |
128 | 128 | ||
129 | void (*handlers[_NSIG])(int sig, struct sigcontext *sc); | 129 | static void (*handlers[_NSIG])(int sig, struct sigcontext *sc); |
130 | 130 | ||
131 | void handle_signal(int sig, struct sigcontext *sc) | 131 | void handle_signal(int sig, struct sigcontext *sc) |
132 | { | 132 | { |
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c index 172ad8f72e12..d6e0a2234b86 100644 --- a/arch/um/os-Linux/skas/process.c +++ b/arch/um/os-Linux/skas/process.c | |||
@@ -96,7 +96,7 @@ bad_wait: | |||
96 | 96 | ||
97 | extern unsigned long current_stub_stack(void); | 97 | extern unsigned long current_stub_stack(void); |
98 | 98 | ||
99 | void get_skas_faultinfo(int pid, struct faultinfo * fi) | 99 | static void get_skas_faultinfo(int pid, struct faultinfo *fi) |
100 | { | 100 | { |
101 | int err; | 101 | int err; |
102 | 102 | ||
diff --git a/arch/um/os-Linux/umid.c b/arch/um/os-Linux/umid.c index 106fa8641553..a27defb81884 100644 --- a/arch/um/os-Linux/umid.c +++ b/arch/um/os-Linux/umid.c | |||
@@ -245,7 +245,7 @@ int __init set_umid(char *name) | |||
245 | /* Changed in make_umid, which is called during early boot */ | 245 | /* Changed in make_umid, which is called during early boot */ |
246 | static int umid_setup = 0; | 246 | static int umid_setup = 0; |
247 | 247 | ||
248 | int __init make_umid(void) | 248 | static int __init make_umid(void) |
249 | { | 249 | { |
250 | int fd, err; | 250 | int fd, err; |
251 | char tmp[256]; | 251 | char tmp[256]; |
diff --git a/arch/um/sys-i386/bugs.c b/arch/um/sys-i386/bugs.c index a74442d13762..2c6d0d731c12 100644 --- a/arch/um/sys-i386/bugs.c +++ b/arch/um/sys-i386/bugs.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include "sysdep/ptrace.h" | 12 | #include "sysdep/ptrace.h" |
13 | 13 | ||
14 | /* Set during early boot */ | 14 | /* Set during early boot */ |
15 | int host_has_cmov = 1; | 15 | static int host_has_cmov = 1; |
16 | static jmp_buf cmov_test_return; | 16 | static jmp_buf cmov_test_return; |
17 | 17 | ||
18 | static void cmov_sigill_test_handler(int sig) | 18 | static void cmov_sigill_test_handler(int sig) |
diff --git a/arch/um/sys-i386/checksum.S b/arch/um/sys-i386/checksum.S index 62c7e564f22e..f058d2f82e18 100644 --- a/arch/um/sys-i386/checksum.S +++ b/arch/um/sys-i386/checksum.S | |||
@@ -243,13 +243,12 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst, | |||
243 | .previous | 243 | .previous |
244 | 244 | ||
245 | .align 4 | 245 | .align 4 |
246 | .globl csum_partial_copy_generic_i386 | 246 | |
247 | |||
248 | #ifndef CONFIG_X86_USE_PPRO_CHECKSUM | 247 | #ifndef CONFIG_X86_USE_PPRO_CHECKSUM |
249 | 248 | ||
250 | #define ARGBASE 16 | 249 | #define ARGBASE 16 |
251 | #define FP 12 | 250 | #define FP 12 |
252 | 251 | ||
253 | csum_partial_copy_generic_i386: | 252 | csum_partial_copy_generic_i386: |
254 | subl $4,%esp | 253 | subl $4,%esp |
255 | pushl %edi | 254 | pushl %edi |
diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c index a34263e6b08d..a4846a84a7be 100644 --- a/arch/um/sys-i386/ldt.c +++ b/arch/um/sys-i386/ldt.c | |||
@@ -14,8 +14,8 @@ | |||
14 | 14 | ||
15 | extern int modify_ldt(int func, void *ptr, unsigned long bytecount); | 15 | extern int modify_ldt(int func, void *ptr, unsigned long bytecount); |
16 | 16 | ||
17 | long write_ldt_entry(struct mm_id * mm_idp, int func, struct user_desc * desc, | 17 | static long write_ldt_entry(struct mm_id *mm_idp, int func, |
18 | void **addr, int done) | 18 | struct user_desc *desc, void **addr, int done) |
19 | { | 19 | { |
20 | long res; | 20 | long res; |
21 | 21 | ||