From 3e0aeab89e8074a4b63596e8c6913d127c807a9f Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Thu, 24 Nov 2016 14:31:42 +0100 Subject: [PATCH] intel_fb: avoid heap warning Fixes #2168 --- repos/dde_linux/src/drivers/framebuffer/intel/lx_emul.cc | 6 ++++++ repos/dde_linux/src/include/lx_emul/impl/pci_resource.h | 6 ------ repos/dde_linux/src/lib/usb/lx_emul.cc | 5 +++++ repos/dde_linux/src/lib/wifi/lxcc_emul.cc | 5 +++++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/repos/dde_linux/src/drivers/framebuffer/intel/lx_emul.cc b/repos/dde_linux/src/drivers/framebuffer/intel/lx_emul.cc index c2b5f7850b..23b148447d 100644 --- a/repos/dde_linux/src/drivers/framebuffer/intel/lx_emul.cc +++ b/repos/dde_linux/src/drivers/framebuffer/intel/lx_emul.cc @@ -494,6 +494,12 @@ struct pci_dev *pci_get_bus_and_slot(unsigned int bus, unsigned int devfn) } +void pci_dev_put(struct pci_dev *pci_dev) +{ + Genode::destroy(Lx::Malloc::mem(), pci_dev); +} + + struct pci_dev *pci_get_class(unsigned int class_code, struct pci_dev *from) { /* diff --git a/repos/dde_linux/src/include/lx_emul/impl/pci_resource.h b/repos/dde_linux/src/include/lx_emul/impl/pci_resource.h index 2e74f4bd81..17d819b517 100644 --- a/repos/dde_linux/src/include/lx_emul/impl/pci_resource.h +++ b/repos/dde_linux/src/include/lx_emul/impl/pci_resource.h @@ -16,12 +16,6 @@ #include -extern void pci_dev_put(struct pci_dev *pci_dev) -{ - Genode::destroy(Genode::env()->heap(), pci_dev); -} - - extern "C" size_t pci_resource_start(struct pci_dev *dev, unsigned bar) { if (bar >= DEVICE_COUNT_RESOURCE) diff --git a/repos/dde_linux/src/lib/usb/lx_emul.cc b/repos/dde_linux/src/lib/usb/lx_emul.cc index c9f7741d3a..7ed5877f7d 100644 --- a/repos/dde_linux/src/lib/usb/lx_emul.cc +++ b/repos/dde_linux/src/lib/usb/lx_emul.cc @@ -41,6 +41,11 @@ unsigned long jiffies; void backtrace() { } +void pci_dev_put(struct pci_dev *pci_dev) +{ + Genode::destroy(Genode::env()->heap(), pci_dev); +} + /*********************** ** Atomic operations ** ***********************/ diff --git a/repos/dde_linux/src/lib/wifi/lxcc_emul.cc b/repos/dde_linux/src/lib/wifi/lxcc_emul.cc index 7cdc5cc3b2..415b4b8c12 100644 --- a/repos/dde_linux/src/lib/wifi/lxcc_emul.cc +++ b/repos/dde_linux/src/lib/wifi/lxcc_emul.cc @@ -1399,6 +1399,11 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler, } +void pci_dev_put(struct pci_dev *pci_dev) +{ + Genode::destroy(Lx_kit::env().heap(), pci_dev); +} + /*********************** ** linux/workquque.h ** ***********************/