Update of /cvsroot/linuxconsole/ruby/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv27749/drivers/char
Modified Files:
mem.c tty_io.c
Log Message:
Synced to 2.5.3
Index: mem.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/mem.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- mem.c 20 Jan 2002 03:54:46 -0000 1.18
+++ mem.c 13 Mar 2002 23:48:37 -0000 1.19
@@ -197,7 +197,7 @@
if (offset >= __pa(high_memory) || (file->f_flags & O_SYNC))
vma->vm_flags |= VM_IO;
- if (remap_page_range(vma->vm_start, offset, vma->vm_end-vma->vm_start,
+ if (remap_page_range(vma, vma->vm_start, offset, vma->vm_end-vma->vm_start,
vma->vm_page_prot))
return -EAGAIN;
return 0;
@@ -358,8 +358,8 @@
if (count > size)
count = size;
- zap_page_range(mm, addr, count);
- zeromap_page_range(addr, count, PAGE_COPY);
+ zap_page_range(vma, addr, count);
+ zeromap_page_range(vma, addr, count, PAGE_COPY);
size -= count;
buf += count;
@@ -375,8 +375,7 @@
unsigned long unwritten = clear_user(buf, PAGE_SIZE);
if (unwritten)
return size + unwritten - PAGE_SIZE;
- if (current->need_resched)
- schedule();
+ cond_resched();
buf += PAGE_SIZE;
size -= PAGE_SIZE;
} while (size);
@@ -429,7 +428,7 @@
{
if (vma->vm_flags & VM_SHARED)
return shmem_zero_setup(vma);
- if (zeromap_page_range(vma->vm_start, vma->vm_end - vma->vm_start, vma->vm_page_prot))
+ if (zeromap_page_range(vma, vma->vm_start, vma->vm_end - vma->vm_start, vma->vm_page_prot))
return -EAGAIN;
return 0;
}
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/tty_io.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- tty_io.c 27 Feb 2002 23:57:43 -0000 1.44
+++ tty_io.c 13 Mar 2002 23:48:37 -0000 1.45
@@ -709,8 +709,7 @@
ret = -ERESTARTSYS;
if (signal_pending(current))
break;
- if (current->need_resched)
- schedule();
+ cond_resched();
}
}
if (written) {
|
