]> xenbits.xensource.com Git - people/sstabellini/xen-unstable.git/.git/commitdiff
x86/pv: Drop redundant CONFIG_PV ifdefary
authorAndrew Cooper <andrew.cooper3@citrix.com>
Wed, 3 Apr 2019 18:55:55 +0000 (19:55 +0100)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Thu, 4 Apr 2019 13:32:41 +0000 (14:32 +0100)
These were made redundant by c/s 23058e7b3 "x86/shadow: put PV L1TF functions
under CONFIG_PV" but makes the surrounding code read as if is outside of the
ifdef.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
xen/include/asm-x86/shadow.h

index 0d9f6632e78f8e191ccefad2b076518238d4340f..f29f0f652ba89d3194f903bd423c3894c4e51121 100644 (file)
@@ -237,7 +237,7 @@ static inline void pv_l1tf_domain_init(struct domain *d)
     d->arch.pv.check_l1tf = is_hardware_domain(d) ? opt_pv_l1tf_hwdom
                                                   : opt_pv_l1tf_domu;
 
-#if defined(CONFIG_SHADOW_PAGING) && defined(CONFIG_PV)
+#ifdef CONFIG_SHADOW_PAGING
     tasklet_init(&d->arch.paging.shadow.pv_l1tf_tasklet,
                  pv_l1tf_tasklet, (unsigned long)d);
 #endif
@@ -245,7 +245,7 @@ static inline void pv_l1tf_domain_init(struct domain *d)
 
 static inline void pv_l1tf_domain_destroy(struct domain *d)
 {
-#if defined(CONFIG_SHADOW_PAGING) && defined(CONFIG_PV)
+#ifdef CONFIG_SHADOW_PAGING
     tasklet_kill(&d->arch.paging.shadow.pv_l1tf_tasklet);
 #endif
 }