From: Roger Pau Monné <roger.pau@citrix.com>
Date: Tue, 17 Oct 2017 10:23:53 +0000 (+0100)
Subject: mm/shadow: fix declaration of fetch_type_names
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1086
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c4efa25058d3f45bf725d6ebe6429db9adf94b62;p=xen.git

mm/shadow: fix declaration of fetch_type_names

fetch_type_names usage is guarded by SHADOW_DEBUG_PROPAGATE in
SHADOW_DEBUG, fix the declaration so it's also guarded by
SHADOW_DEBUG_PROPAGATE instead of DEBUG_TRACE_DUMP.

Observed while building with clang and ubsan enabled.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
Release-acked-by: Julien Grall <julien.grall@linaro.org>
---

diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c
index d540af11d7..9156382056 100644
--- a/xen/arch/x86/mm/shadow/multi.c
+++ b/xen/arch/x86/mm/shadow/multi.c
@@ -77,7 +77,7 @@ typedef enum {
 
 extern const char *const fetch_type_names[];
 
-#if defined(DEBUG_TRACE_DUMP) && CONFIG_PAGING_LEVELS == GUEST_PAGING_LEVELS
+#if SHADOW_DEBUG_PROPAGATE && CONFIG_PAGING_LEVELS == GUEST_PAGING_LEVELS
 const char *const fetch_type_names[] = {
     [ft_prefetch]     = "prefetch",
     [ft_demand_read]  = "demand read",