fuzz cleanup

diff --git a/queue-3.0/xen-mark-local-pages-as-foreign-in-the-m2p_override.patch b/queue-3.0/xen-mark-local-pages-as-foreign-in-the-m2p_override.patch
index 71e5696fc673e4a7f7dd20289b3f2002ff3ee178..71e01bf8cb8150e291eea9ca1d4e555553af680b 100644 (file)
--- a/queue-3.0/xen-mark-local-pages-as-foreign-in-the-m2p_override.patch
+++ b/queue-3.0/xen-mark-local-pages-as-foreign-in-the-m2p_override.patch
@@ -88,7 +88,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/arch/x86/xen/p2m.c
 +++ b/arch/x86/xen/p2m.c
-@@ -688,6 +688,7 @@ int m2p_add_override(unsigned long mfn,
+@@ -683,6 +683,7 @@ int m2p_add_override(unsigned long mfn,
        unsigned long uninitialized_var(address);
        unsigned level;
        pte_t *ptep = NULL;
@@ -96,7 +96,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        pfn = page_to_pfn(page);
        if (!PageHighMem(page)) {
-@@ -711,6 +712,24 @@ int m2p_add_override(unsigned long mfn,
+@@ -706,6 +707,24 @@ int m2p_add_override(unsigned long mfn,
        list_add(&page->lru,  &m2p_overrides[mfn_hash(mfn)]);
        spin_unlock_irqrestore(&m2p_override_lock, flags);
  
@@ -121,7 +121,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        return 0;
  }
  EXPORT_SYMBOL_GPL(m2p_add_override);
-@@ -722,6 +741,7 @@ int m2p_remove_override(struct page *pag
+@@ -717,6 +736,7 @@ int m2p_remove_override(struct page *pag
        unsigned long uninitialized_var(address);
        unsigned level;
        pte_t *ptep = NULL;
@@ -129,7 +129,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        pfn = page_to_pfn(page);
        mfn = get_phys_to_machine(pfn);
-@@ -748,6 +768,22 @@ int m2p_remove_override(struct page *pag
+@@ -743,6 +763,22 @@ int m2p_remove_override(struct page *pag
                /* No tlb flush necessary because the caller already
                 * left the pte unmapped. */
  

diff --git a/queue-3.4/xen-mark-local-pages-as-foreign-in-the-m2p_override.patch b/queue-3.4/xen-mark-local-pages-as-foreign-in-the-m2p_override.patch
index caaf876a43a57d6d9d0aebc16bf4cfbf4113647e..08a8d99ced3f2a86425e5a4a641f6919fbc65ef7 100644 (file)
--- a/queue-3.4/xen-mark-local-pages-as-foreign-in-the-m2p_override.patch
+++ b/queue-3.4/xen-mark-local-pages-as-foreign-in-the-m2p_override.patch
@@ -88,7 +88,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/arch/x86/xen/p2m.c
 +++ b/arch/x86/xen/p2m.c
-@@ -691,6 +691,7 @@ int m2p_add_override(unsigned long mfn,
+@@ -686,6 +686,7 @@ int m2p_add_override(unsigned long mfn,
        unsigned long uninitialized_var(address);
        unsigned level;
        pte_t *ptep = NULL;
@@ -96,7 +96,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        pfn = page_to_pfn(page);
        if (!PageHighMem(page)) {
-@@ -726,6 +727,24 @@ int m2p_add_override(unsigned long mfn,
+@@ -721,6 +722,24 @@ int m2p_add_override(unsigned long mfn,
        list_add(&page->lru,  &m2p_overrides[mfn_hash(mfn)]);
        spin_unlock_irqrestore(&m2p_override_lock, flags);
  
@@ -121,7 +121,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        return 0;
  }
  EXPORT_SYMBOL_GPL(m2p_add_override);
-@@ -737,6 +756,7 @@ int m2p_remove_override(struct page *pag
+@@ -732,6 +751,7 @@ int m2p_remove_override(struct page *pag
        unsigned long uninitialized_var(address);
        unsigned level;
        pte_t *ptep = NULL;
@@ -129,7 +129,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        pfn = page_to_pfn(page);
        mfn = get_phys_to_machine(pfn);
-@@ -806,6 +826,22 @@ int m2p_remove_override(struct page *pag
+@@ -801,6 +821,22 @@ int m2p_remove_override(struct page *pag
        } else
                set_phys_to_machine(pfn, page->index);