Since commit 60a9b0715055 ("xen: introduce CONFIG_GENERIC_BUG_FRAME"), the new
common bug.h provides an implementation of run_in_exception_handler() in all
cases, making the #else here dead.Signed-off-by: Andrew Cooper <[email protected]> --- CC: George Dunlap <[email protected]> CC: Jan Beulich <[email protected]> CC: Stefano Stabellini <[email protected]> CC: Wei Liu <[email protected]> CC: Julien Grall <[email protected]> CC: Federico Serafini <[email protected]> --- xen/drivers/char/ehci-dbgp.c | 4 ---- xen/drivers/char/ns16550.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c index 0f5b41899ef5..bbf4e51c0263 100644 --- a/xen/drivers/char/ehci-dbgp.c +++ b/xen/drivers/char/ehci-dbgp.c @@ -1293,11 +1293,7 @@ static void cf_check _ehci_dbgp_poll(struct cpu_user_regs *regs) static void cf_check ehci_dbgp_poll(void *data) { poll_port = data; -#ifdef run_in_exception_handler run_in_exception_handler(_ehci_dbgp_poll); -#else - _ehci_dbgp_poll(guest_cpu_user_regs()); -#endif } static bool ehci_dbgp_setup_preirq(struct ehci_dbgp *dbgp) diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index c8a51ed66008..29691e8d3ae6 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -233,11 +233,7 @@ static void cf_check __ns16550_poll(struct cpu_user_regs *regs) static void cf_check ns16550_poll(void *data) { this_cpu(poll_port) = data; -#ifdef run_in_exception_handler run_in_exception_handler(__ns16550_poll); -#else - __ns16550_poll(guest_cpu_user_regs()); -#endif } static int cf_check ns16550_tx_ready(struct serial_port *port) -- 2.30.2
