diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
| commit | 198030782cedf25391e67e7c88b04f87a5eb6563 (patch) | |
| tree | 5b7368c6bf052bcb4bb273497a57900720d36f51 /arch/x86/mm/pageattr.c | |
| parent | 4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e (diff) | |
| parent | 92181f190b649f7ef2b79cbf5c00f26ccc66da2a (diff) | |
Merge branch 'x86/mm' into core/percpu
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'arch/x86/mm/pageattr.c')
| -rw-r--r-- | arch/x86/mm/pageattr.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 4cf30dee8161..e89d24815f26 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c | |||
| @@ -555,12 +555,10 @@ repeat: | |||
| 555 | if (!pte_val(old_pte)) { | 555 | if (!pte_val(old_pte)) { |
| 556 | if (!primary) | 556 | if (!primary) |
| 557 | return 0; | 557 | return 0; |
| 558 | 558 | WARN(1, KERN_WARNING "CPA: called for zero pte. " | |
| 559 | /* | 559 | "vaddr = %lx cpa->vaddr = %lx\n", address, |
| 560 | * Special error value returned, indicating that the mapping | 560 | *cpa->vaddr); |
| 561 | * did not exist at this address. | 561 | return -EINVAL; |
| 562 | */ | ||
| 563 | return -EFAULT; | ||
| 564 | } | 562 | } |
| 565 | 563 | ||
| 566 | if (level == PG_LEVEL_4K) { | 564 | if (level == PG_LEVEL_4K) { |