git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/misc' into for-linus
[pandora-kernel.git]
/
arch
/
parisc
/
mm
/
fault.c
diff --git
a/arch/parisc/mm/fault.c
b/arch/parisc/mm/fault.c
index
92c7fa4
..
c6afbfc
100644
(file)
--- a/
arch/parisc/mm/fault.c
+++ b/
arch/parisc/mm/fault.c
@@
-1,5
+1,4
@@
-/* $Id: fault.c,v 1.5 2000/01/26 16:20:29 jsm Exp $
- *
+/*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
@@
-202,7
+201,7
@@
good_area:
* fault.
*/
* fault.
*/
- fault = handle_mm_fault(mm, vma, address, (acc_type & VM_WRITE)
!=
0);
+ fault = handle_mm_fault(mm, vma, address, (acc_type & VM_WRITE)
? FAULT_FLAG_WRITE :
0);
if (unlikely(fault & VM_FAULT_ERROR)) {
/*
* We hit a shared mapping outside of the file, or some
if (unlikely(fault & VM_FAULT_ERROR)) {
/*
* We hit a shared mapping outside of the file, or some