[Xen-changelog] [xen master] x86/shadow: Fix build with CONFIG_SHADOW_PAGING=n following c/s 2fc002b

[patchbot@xxxxxxx]

commit c31d8368a60d4eecf371193a3d144418c48063c6
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Fri Jul 15 13:07:09 2016 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Fri Jul 15 13:25:26 2016 +0100

    x86/shadow: Fix build with CONFIG_SHADOW_PAGING=n following c/s 2fc002b
    
    c/s 2fc002b "xen: Use a typesafe to define INVALID_GFN" changed INVALID_GFN 
to
    be a boxed type.
    
    Identified by a Travis randconfig run:
      https://travis-ci.org/xen-project/xen/jobs/144980445
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Tim Deegan <tim@xxxxxxx>
---
 xen/arch/x86/mm/shadow/none.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/mm/shadow/none.c b/xen/arch/x86/mm/shadow/none.c
index 38bdf92..69e56c5 100644
--- a/xen/arch/x86/mm/shadow/none.c
+++ b/xen/arch/x86/mm/shadow/none.c
@@ -42,7 +42,7 @@ static unsigned long _gva_to_gfn(struct vcpu *v, struct 
p2m_domain *p2m,
                                  unsigned long va, uint32_t *pfec)
 {
     ASSERT_UNREACHABLE();
-    return INVALID_GFN;
+    return gfn_x(INVALID_GFN);
 }
 
 static void _update_cr3(struct vcpu *v, int do_locking)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog