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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
sparc64
/
mm
/
fault.c
diff --git
a/arch/sparc64/mm/fault.c
b/arch/sparc64/mm/fault.c
index
49c3dd2
..
640c46e
100644
(file)
--- a/
arch/sparc64/mm/fault.c
+++ b/
arch/sparc64/mm/fault.c
@@
-428,8
+428,7
@@
good_area:
if (tlb_type == spitfire &&
(vma->vm_flags & VM_EXEC) != 0 &&
vma->vm_file != NULL)
if (tlb_type == spitfire &&
(vma->vm_flags & VM_EXEC) != 0 &&
vma->vm_file != NULL)
- set_thread_fault_code(fault_code |
- FAULT_CODE_BLKCOMMIT);
+ set_thread_flag(TIF_BLKCOMMIT);
} else {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
} else {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
@@
-498,5
+497,6
@@
do_sigbus:
fault_done:
/* These values are no longer needed, clear them. */
set_thread_fault_code(0);
fault_done:
/* These values are no longer needed, clear them. */
set_thread_fault_code(0);
+ clear_thread_flag(TIF_BLKCOMMIT);
current_thread_info()->fault_address = 0;
}
current_thread_info()->fault_address = 0;
}