[PATCH] uml: x86_64 fixes
This fixes some x86_64 bugs - - maybe_map returns -1 on error instead of 0, which is interpreted as physical address 0 - removed an include of ipc.h, which isn't needed - fixed the calculation of signal frame location - the signal delivery code is now immune to the stack expansion check - added a missing include Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
0f7e663dea
commit
2d58cc9a43
@ -29,9 +29,12 @@ static unsigned long maybe_map(unsigned long virt, int is_write)
|
||||
if(IS_ERR(phys) || (is_write && !pte_write(pte))){
|
||||
err = handle_page_fault(virt, 0, is_write, 1, &dummy_code);
|
||||
if(err)
|
||||
return(0);
|
||||
return(-1UL);
|
||||
phys = um_virt_to_phys(current, virt, NULL);
|
||||
}
|
||||
if(IS_ERR(phys))
|
||||
phys = (void *) -1;
|
||||
|
||||
return((unsigned long) phys);
|
||||
}
|
||||
|
||||
@ -42,7 +45,7 @@ static int do_op(unsigned long addr, int len, int is_write,
|
||||
int n;
|
||||
|
||||
addr = maybe_map(addr, is_write);
|
||||
if(addr == -1)
|
||||
if(addr == -1UL)
|
||||
return(-1);
|
||||
|
||||
page = phys_to_page(addr);
|
||||
|
Reference in New Issue
Block a user