aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/sys-i386
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um/sys-i386')
-rw-r--r--arch/um/sys-i386/bugs.c4
-rw-r--r--arch/um/sys-i386/ldt.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/sys-i386/bugs.c b/arch/um/sys-i386/bugs.c
index f5dfe49c8442..0393e44813e7 100644
--- a/arch/um/sys-i386/bugs.c
+++ b/arch/um/sys-i386/bugs.c
@@ -28,7 +28,7 @@ static char token(int fd, char *buf, int len, char stop)
28 ptr = buf; 28 ptr = buf;
29 end = &buf[len]; 29 end = &buf[len];
30 do { 30 do {
31 n = os_read_file_k(fd, ptr, sizeof(*ptr)); 31 n = os_read_file(fd, ptr, sizeof(*ptr));
32 c = *ptr++; 32 c = *ptr++;
33 if(n != sizeof(*ptr)){ 33 if(n != sizeof(*ptr)){
34 if(n == 0) 34 if(n == 0)
@@ -67,7 +67,7 @@ static int find_cpuinfo_line(int fd, char *key, char *scratch, int len)
67 return 1; 67 return 1;
68 68
69 do { 69 do {
70 n = os_read_file_k(fd, &c, sizeof(c)); 70 n = os_read_file(fd, &c, sizeof(c));
71 if(n != sizeof(c)){ 71 if(n != sizeof(c)){
72 printk("Failed to find newline in " 72 printk("Failed to find newline in "
73 "/proc/cpuinfo, err = %d\n", -n); 73 "/proc/cpuinfo, err = %d\n", -n);
diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c
index d031a13bd969..a939a7ef0227 100644
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
@@ -517,7 +517,7 @@ long init_new_ldt(struct mmu_context_skas * new_mm,
517 .u = 517 .u =
518 { .copy_segments = 518 { .copy_segments =
519 from_mm->id.u.mm_fd } } ); 519 from_mm->id.u.mm_fd } } );
520 i = os_write_file_k(new_mm->id.u.mm_fd, &copy, sizeof(copy)); 520 i = os_write_file(new_mm->id.u.mm_fd, &copy, sizeof(copy));
521 if(i != sizeof(copy)) 521 if(i != sizeof(copy))
522 printk("new_mm : /proc/mm copy_segments failed, " 522 printk("new_mm : /proc/mm copy_segments failed, "
523 "err = %d\n", -i); 523 "err = %d\n", -i);