diff options
Diffstat (limited to 'arch/um/sys-i386')
-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 |
3 files changed, 5 insertions, 6 deletions
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 | ||