git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
um
/
kernel
/
skas
/
uaccess.c
diff --git
a/arch/um/kernel/skas/uaccess.c
b/arch/um/kernel/skas/uaccess.c
index
8912cec
..
5992c32
100644
(file)
--- a/
arch/um/kernel/skas/uaccess.c
+++ b/
arch/um/kernel/skas/uaccess.c
@@
-8,7
+8,6
@@
#include "linux/kernel.h"
#include "linux/string.h"
#include "linux/fs.h"
#include "linux/kernel.h"
#include "linux/string.h"
#include "linux/fs.h"
-#include "linux/hardirq.h"
#include "linux/highmem.h"
#include "asm/page.h"
#include "asm/pgtable.h"
#include "linux/highmem.h"
#include "asm/page.h"
#include "asm/pgtable.h"
@@
-39,7
+38,7
@@
static unsigned long maybe_map(unsigned long virt, int is_write)
return((unsigned long) phys);
}
return((unsigned long) phys);
}
-static int do_op
_one_page
(unsigned long addr, int len, int is_write,
+static int do_op(unsigned long addr, int len, int is_write,
int (*op)(unsigned long addr, int len, void *arg), void *arg)
{
struct page *page;
int (*op)(unsigned long addr, int len, void *arg), void *arg)
{
struct page *page;
@@
-50,11
+49,9
@@
static int do_op_one_page(unsigned long addr, int len, int is_write,
return(-1);
page = phys_to_page(addr);
return(-1);
page = phys_to_page(addr);
- addr = (unsigned long) kmap_atomic(page, KM_UML_USERCOPY) + (addr & ~PAGE_MASK);
-
+ addr = (unsigned long) kmap(page) + (addr & ~PAGE_MASK);
n = (*op)(addr, len, arg);
n = (*op)(addr, len, arg);
-
- kunmap_atomic(page, KM_UML_USERCOPY);
+ kunmap(page);
return(n);
}
return(n);
}
@@
-80,7
+77,7
@@
static void do_buffer_op(void *jmpbuf, void *arg_ptr)
remain = len;
current->thread.fault_catcher = jmpbuf;
remain = len;
current->thread.fault_catcher = jmpbuf;
- n = do_op
_one_page
(addr, size, is_write, op, arg);
+ n = do_op(addr, size, is_write, op, arg);
if(n != 0){
*res = (n < 0 ? remain : 0);
goto out;
if(n != 0){
*res = (n < 0 ? remain : 0);
goto out;
@@
-94,7
+91,7
@@
static void do_buffer_op(void *jmpbuf, void *arg_ptr)
}
while(addr < ((addr + remain) & PAGE_MASK)){
}
while(addr < ((addr + remain) & PAGE_MASK)){
- n = do_op
_one_page
(addr, PAGE_SIZE, is_write, op, arg);
+ n = do_op(addr, PAGE_SIZE, is_write, op, arg);
if(n != 0){
*res = (n < 0 ? remain : 0);
goto out;
if(n != 0){
*res = (n < 0 ? remain : 0);
goto out;
@@
-108,7
+105,7
@@
static void do_buffer_op(void *jmpbuf, void *arg_ptr)
goto out;
}
goto out;
}
- n = do_op
_one_page
(addr, remain, is_write, op, arg);
+ n = do_op(addr, remain, is_write, op, arg);
if(n != 0)
*res = (n < 0 ? remain : 0);
else *res = 0;
if(n != 0)
*res = (n < 0 ? remain : 0);
else *res = 0;