x86/pv: Drop redundant CONFIG_PV ifdefary
diff mbox series

Message ID 1554317778-17602-1-git-send-email-andrew.cooper3@citrix.com
State New, archived
Headers show
Series
  • x86/pv: Drop redundant CONFIG_PV ifdefary
Related show

Commit Message

Andrew Cooper April 3, 2019, 6:56 p.m. UTC
These were made redundant by c/s 23058e7b3 "x86/shadow: put PV L1TF functions
under CONFIG_PV" but makes the code read as if outside of the ifdef.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Wei Liu <wei.liu2@citrix.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
---
 xen/include/asm-x86/shadow.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Wei Liu April 4, 2019, 8:25 a.m. UTC | #1
On Wed, Apr 03, 2019 at 07:56:18PM +0100, Andrew Cooper wrote:
> These were made redundant by c/s 23058e7b3 "x86/shadow: put PV L1TF functions
> under CONFIG_PV" but makes the code read as if outside of the ifdef.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Jan Beulich April 4, 2019, 11:44 a.m. UTC | #2
>>> On 04.04.19 at 10:25, <wei.liu2@citrix.com> wrote:
> On Wed, Apr 03, 2019 at 07:56:18PM +0100, Andrew Cooper wrote:
>> These were made redundant by c/s 23058e7b3 "x86/shadow: put PV L1TF functions
>> under CONFIG_PV" but makes the code read as if 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>
albeit preferably with the shorter #ifdef used.

Jan

Patch
diff mbox series

diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h
index 0d9f663..2690584 100644
--- a/xen/include/asm-x86/shadow.h
+++ b/xen/include/asm-x86/shadow.h
@@ -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)
+#if defined(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)
+#if defined(CONFIG_SHADOW_PAGING)
     tasklet_kill(&d->arch.paging.shadow.pv_l1tf_tasklet);
 #endif
 }