projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (patches from Andrew)
[linux-2.6-block.git]
/
arch
/
x86
/
mm
/
pageattr.c
diff --git
a/arch/x86/mm/pageattr.c
b/arch/x86/mm/pageattr.c
index e64a4703f8b12ef3b602dc8131ac52d8c6c7f8e1..4d0b26253042d525107106f8e230535c65f25ca8 100644
(file)
--- a/
arch/x86/mm/pageattr.c
+++ b/
arch/x86/mm/pageattr.c
@@
-1122,8
+1122,10
@@
static int __cpa_process_fault(struct cpa_data *cpa, unsigned long vaddr,
/*
* Ignore all non primary paths.
*/
- if (!primary)
+ if (!primary) {
+ cpa->numpages = 1;
return 0;
+ }
/*
* Ignore the NULL PTE for kernel identity mapping, as it is expected