From de9ea4361614879925bad3dd5ef0b1cc6ea95c83 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Tue, 7 Feb 2023 16:48:06 +0100 Subject: [PATCH] dde_linux: remove custom lx_backtrace (use lx_emul_backtrace) --- repos/dde_linux/src/lib/lx_emul/pci_bus.c | 3 --- repos/pc/lib/mk/wifi.inc | 1 - repos/pc/src/drivers/usb_host/pc/misc.cc | 20 -------------------- repos/pc/src/lib/wifi/lx_emul.c | 4 ++-- repos/pc/src/lib/wifi/lx_emul.h | 2 -- repos/pc/src/lib/wifi/misc.cc | 20 -------------------- repos/pc/src/lib/wifi/symbol.map | 2 +- 7 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 repos/pc/src/drivers/usb_host/pc/misc.cc delete mode 100644 repos/pc/src/lib/wifi/misc.cc diff --git a/repos/dde_linux/src/lib/lx_emul/pci_bus.c b/repos/dde_linux/src/lib/lx_emul/pci_bus.c index ec0fe9691d..3ba174d41f 100644 --- a/repos/dde_linux/src/lib/lx_emul/pci_bus.c +++ b/repos/dde_linux/src/lib/lx_emul/pci_bus.c @@ -20,9 +20,6 @@ #include -extern void lx_backtrace(void); - - int arch_probe_nr_irqs(void) { /* needed for 'irq_get_irq_data()' in 'pci_assign_irq()' below */ diff --git a/repos/pc/lib/mk/wifi.inc b/repos/pc/lib/mk/wifi.inc index 88052e0cfb..c032a9fa16 100644 --- a/repos/pc/lib/mk/wifi.inc +++ b/repos/pc/lib/mk/wifi.inc @@ -9,7 +9,6 @@ LD_OPT += --version-script=$(TARGET_LIB_DIR)/symbol.map LIBS += base jitterentropy pc_linux_generated pc_lx_emul INC_DIR := $(TARGET_LIB_DIR) SRC_CC += wlan.cc -SRC_CC += misc.cc SRC_CC += firmware.cc SRC_CC += socket_call.cc SRC_CC += lx_emul/random.cc diff --git a/repos/pc/src/drivers/usb_host/pc/misc.cc b/repos/pc/src/drivers/usb_host/pc/misc.cc deleted file mode 100644 index 73f6e67174..0000000000 --- a/repos/pc/src/drivers/usb_host/pc/misc.cc +++ /dev/null @@ -1,20 +0,0 @@ -/* - * \brief Misc - * \author Josef Soentgen - * \date 2022-01-20 - */ - -/* - * Copyright (C) 2022 Genode Labs GmbH - * - * This file is distributed under the terms of the GNU General Public License - * version 2. - */ - -/* Genode includes */ -#include - -extern "C" void lx_backtrace(void) -{ - Genode::backtrace(); -} diff --git a/repos/pc/src/lib/wifi/lx_emul.c b/repos/pc/src/lib/wifi/lx_emul.c index 297dec8862..499d7a9d75 100644 --- a/repos/pc/src/lib/wifi/lx_emul.c +++ b/repos/pc/src/lib/wifi/lx_emul.c @@ -425,7 +425,7 @@ size_t _copy_to_iter(const void * addr, size_t bytes, struct iov_iter * i) asmlinkage __visible void dump_stack(void) { - lx_backtrace(); + lx_emul_backtrace(); } @@ -479,7 +479,7 @@ void page_frag_free(void * addr) struct page *page = lx_emul_virt_to_pages(addr, 1ul); if (!page) { printk("BUG %s: page for addr: %p not found\n", __func__, addr); - lx_backtrace(); + lx_emul_backtrace(); } __free_pages(page, 0ul); diff --git a/repos/pc/src/lib/wifi/lx_emul.h b/repos/pc/src/lib/wifi/lx_emul.h index 0915c039ac..8d1e9bb67c 100644 --- a/repos/pc/src/lib/wifi/lx_emul.h +++ b/repos/pc/src/lib/wifi/lx_emul.h @@ -24,8 +24,6 @@ extern "C" { #endif -void lx_backtrace(void); - void lx_emul_time_udelay(unsigned long usec); int lx_emul_rfkill_get_any(void); diff --git a/repos/pc/src/lib/wifi/misc.cc b/repos/pc/src/lib/wifi/misc.cc deleted file mode 100644 index 73f6e67174..0000000000 --- a/repos/pc/src/lib/wifi/misc.cc +++ /dev/null @@ -1,20 +0,0 @@ -/* - * \brief Misc - * \author Josef Soentgen - * \date 2022-01-20 - */ - -/* - * Copyright (C) 2022 Genode Labs GmbH - * - * This file is distributed under the terms of the GNU General Public License - * version 2. - */ - -/* Genode includes */ -#include - -extern "C" void lx_backtrace(void) -{ - Genode::backtrace(); -} diff --git a/repos/pc/src/lib/wifi/symbol.map b/repos/pc/src/lib/wifi/symbol.map index df3487a3ba..700ff56011 100644 --- a/repos/pc/src/lib/wifi/symbol.map +++ b/repos/pc/src/lib/wifi/symbol.map @@ -21,7 +21,7 @@ jiffies; /* for general debugging purposes */ - lx_backtrace; + lx_emul_backtrace; local: