|
@@ -671,7 +671,9 @@ int m2p_add_override(unsigned long mfn, struct page *page)
|
|
page->private = mfn;
|
|
page->private = mfn;
|
|
page->index = pfn_to_mfn(pfn);
|
|
page->index = pfn_to_mfn(pfn);
|
|
|
|
|
|
- __set_phys_to_machine(pfn, FOREIGN_FRAME(mfn));
|
|
|
|
|
|
+ if (unlikely(!set_phys_to_machine(pfn, FOREIGN_FRAME(mfn))))
|
|
|
|
+ return -ENOMEM;
|
|
|
|
+
|
|
if (!PageHighMem(page))
|
|
if (!PageHighMem(page))
|
|
/* Just zap old mapping for now */
|
|
/* Just zap old mapping for now */
|
|
pte_clear(&init_mm, address, ptep);
|
|
pte_clear(&init_mm, address, ptep);
|
|
@@ -709,7 +711,7 @@ int m2p_remove_override(struct page *page)
|
|
spin_lock_irqsave(&m2p_override_lock, flags);
|
|
spin_lock_irqsave(&m2p_override_lock, flags);
|
|
list_del(&page->lru);
|
|
list_del(&page->lru);
|
|
spin_unlock_irqrestore(&m2p_override_lock, flags);
|
|
spin_unlock_irqrestore(&m2p_override_lock, flags);
|
|
- __set_phys_to_machine(pfn, page->index);
|
|
|
|
|
|
+ set_phys_to_machine(pfn, page->index);
|
|
|
|
|
|
if (!PageHighMem(page))
|
|
if (!PageHighMem(page))
|
|
set_pte_at(&init_mm, address, ptep,
|
|
set_pte_at(&init_mm, address, ptep,
|