From: Sergey Dyasli <sergey.dyasli@citrix.com>
Date: Tue, 6 Mar 2018 15:47:34 +0000 (+0100)
Subject: pv_console: remove unnecessary #ifdefs
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~465
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0d9acbdd8d6edcc8f1572a270b087c36e81504fd;p=xen.git

pv_console: remove unnecessary #ifdefs

The header for PV console contains empty function definitions in case of
!CONFIG_XEN_GUEST specially to avoid #ifdefs in a code that uses them
to make the code look cleaner.

Unfortunately, during the release of shim-comet, PV console functions
were enclosed into unnecessary #ifdefs CONFIG_X86. Remove them.

Signed-off-by: Sergey Dyasli <sergey.dyasli@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index 121073c8ed..0f0536930b 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -30,10 +30,10 @@
 #include <xen/hypercall.h> /* for do_console_io */
 #include <xen/early_printk.h>
 #include <xen/warning.h>
+#include <xen/pv_console.h>
 
 #ifdef CONFIG_X86
 #include <xen/consoled.h>
-#include <xen/pv_console.h>
 #include <asm/guest.h>
 #endif
 
@@ -347,10 +347,8 @@ static void sercon_puts(const char *s)
     else
         serial_puts(sercon_handle, s);
 
-#ifdef CONFIG_X86
     /* Copy all serial output into PV console */
     pv_console_puts(s);
-#endif
 }
 
 static void dump_console_ring_key(unsigned char key)
@@ -816,9 +814,9 @@ void __init console_init_preirq(void)
             p++;
         if ( !strncmp(p, "vga", 3) )
             video_init();
-#ifdef CONFIG_X86
-	else if ( !strncmp(p, "pv", 2) )
+        else if ( !strncmp(p, "pv", 2) )
             pv_console_init();
+#ifdef CONFIG_X86
         else if ( !strncmp(p, "xen", 3) )
             opt_console_xen = true;
 #endif
@@ -841,10 +839,7 @@ void __init console_init_preirq(void)
     }
 
     serial_set_rx_handler(sercon_handle, serial_rx);
-
-#ifdef CONFIG_X86
     pv_console_set_rx_handler(serial_rx);
-#endif
 
     /* HELLO WORLD --- start-of-day banner text. */
     spin_lock(&console_lock);
@@ -897,10 +892,7 @@ void __init console_init_ring(void)
 void __init console_init_postirq(void)
 {
     serial_init_postirq();
-
-#ifdef CONFIG_X86
     pv_console_init_postirq();
-#endif
 
     if ( conring != _conring )
         return;