From df459c46ef17d40ca148c8aef90c7ab812b2cc4a Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Tue, 23 Jan 2024 17:36:14 +0100 Subject: [PATCH] usb_net: adjust to virt_linux config changes * remove dummies for '__alloc_pages' and friends issue #5104 --- repos/dde_linux/src/drivers/usb_net/dep.list | 1 + repos/dde_linux/src/drivers/usb_net/lx_emul.c | 6 ------ .../usb_net/spec/arm_v6/generated_dummies.c | 18 +----------------- .../usb_net/spec/arm_v7/generated_dummies.c | 18 +----------------- .../usb_net/spec/arm_v8/generated_dummies.c | 18 +----------------- .../usb_net/spec/x86_32/generated_dummies.c | 18 +----------------- .../usb_net/spec/x86_64/generated_dummies.c | 14 -------------- 7 files changed, 5 insertions(+), 88 deletions(-) diff --git a/repos/dde_linux/src/drivers/usb_net/dep.list b/repos/dde_linux/src/drivers/usb_net/dep.list index ec6c9fc72f..e19e6ce634 100644 --- a/repos/dde_linux/src/drivers/usb_net/dep.list +++ b/repos/dde_linux/src/drivers/usb_net/dep.list @@ -270,6 +270,7 @@ drivers/base/base.h drivers/base/physical_location.h drivers/base/power/power.h drivers/base/trace.h +drivers/net/usb/smsc95xx.h drivers/usb/core/hub.h drivers/usb/core/otg_productlist.h drivers/usb/core/usb.h diff --git a/repos/dde_linux/src/drivers/usb_net/lx_emul.c b/repos/dde_linux/src/drivers/usb_net/lx_emul.c index 7d8dae91a7..4573db6ee6 100644 --- a/repos/dde_linux/src/drivers/usb_net/lx_emul.c +++ b/repos/dde_linux/src/drivers/usb_net/lx_emul.c @@ -73,12 +73,6 @@ unsigned long get_zeroed_page(gfp_t gfp_mask) } -void free_pages(unsigned long addr,unsigned int order) -{ - kfree((void *)addr); -} - - #include void * page_frag_alloc_align(struct page_frag_cache * nc, unsigned int fragsz, diff --git a/repos/dde_linux/src/drivers/usb_net/spec/arm_v6/generated_dummies.c b/repos/dde_linux/src/drivers/usb_net/spec/arm_v6/generated_dummies.c index b6d944ce97..bcb976b396 100644 --- a/repos/dde_linux/src/drivers/usb_net/spec/arm_v6/generated_dummies.c +++ b/repos/dde_linux/src/drivers/usb_net/spec/arm_v6/generated_dummies.c @@ -1,20 +1,12 @@ /* * \brief Dummy definitions of Linux Kernel functions * \author Automatically generated file - do no edit - * \date 2024-01-18 + * \date 2024-01-23 */ #include -#include - -struct page * __alloc_pages(gfp_t gfp,unsigned int order,int preferred_nid,nodemask_t * nodemask) -{ - lx_emul_trace_and_stop(__func__); -} - - #include const char * __clk_get_name(const struct clk * clk) @@ -36,14 +28,6 @@ int __devm_mdiobus_register(struct device * dev,struct mii_bus * bus,struct modu } -#include - -void __folio_put(struct folio * folio) -{ - lx_emul_trace_and_stop(__func__); -} - - #include int __ipv6_addr_type(const struct in6_addr * addr) diff --git a/repos/dde_linux/src/drivers/usb_net/spec/arm_v7/generated_dummies.c b/repos/dde_linux/src/drivers/usb_net/spec/arm_v7/generated_dummies.c index 827d950139..d0e5e79b0b 100644 --- a/repos/dde_linux/src/drivers/usb_net/spec/arm_v7/generated_dummies.c +++ b/repos/dde_linux/src/drivers/usb_net/spec/arm_v7/generated_dummies.c @@ -1,20 +1,12 @@ /* * \brief Dummy definitions of Linux Kernel functions * \author Automatically generated file - do no edit - * \date 2024-01-18 + * \date 2024-01-23 */ #include -#include - -struct page * __alloc_pages(gfp_t gfp,unsigned int order,int preferred_nid,nodemask_t * nodemask) -{ - lx_emul_trace_and_stop(__func__); -} - - #include const char * __clk_get_name(const struct clk * clk) @@ -36,14 +28,6 @@ int __devm_mdiobus_register(struct device * dev,struct mii_bus * bus,struct modu } -#include - -void __folio_put(struct folio * folio) -{ - lx_emul_trace_and_stop(__func__); -} - - #include int __ipv6_addr_type(const struct in6_addr * addr) diff --git a/repos/dde_linux/src/drivers/usb_net/spec/arm_v8/generated_dummies.c b/repos/dde_linux/src/drivers/usb_net/spec/arm_v8/generated_dummies.c index 55a8474900..13e003694a 100644 --- a/repos/dde_linux/src/drivers/usb_net/spec/arm_v8/generated_dummies.c +++ b/repos/dde_linux/src/drivers/usb_net/spec/arm_v8/generated_dummies.c @@ -1,20 +1,12 @@ /* * \brief Dummy definitions of Linux Kernel functions * \author Automatically generated file - do no edit - * \date 2024-01-18 + * \date 2024-01-23 */ #include -#include - -struct page * __alloc_pages(gfp_t gfp,unsigned int order,int preferred_nid,nodemask_t * nodemask) -{ - lx_emul_trace_and_stop(__func__); -} - - #include const char * __clk_get_name(const struct clk * clk) @@ -36,14 +28,6 @@ int __devm_mdiobus_register(struct device * dev,struct mii_bus * bus,struct modu } -#include - -void __folio_put(struct folio * folio) -{ - lx_emul_trace_and_stop(__func__); -} - - #include int __ipv6_addr_type(const struct in6_addr * addr) diff --git a/repos/dde_linux/src/drivers/usb_net/spec/x86_32/generated_dummies.c b/repos/dde_linux/src/drivers/usb_net/spec/x86_32/generated_dummies.c index d9924d3096..9747154e38 100644 --- a/repos/dde_linux/src/drivers/usb_net/spec/x86_32/generated_dummies.c +++ b/repos/dde_linux/src/drivers/usb_net/spec/x86_32/generated_dummies.c @@ -1,20 +1,12 @@ /* * \brief Dummy definitions of Linux Kernel functions * \author Automatically generated file - do no edit - * \date 2024-01-22 + * \date 2024-01-23 */ #include -#include - -struct page * __alloc_pages(gfp_t gfp,unsigned int order,int preferred_nid,nodemask_t * nodemask) -{ - lx_emul_trace_and_stop(__func__); -} - - #include struct cpumask __cpu_active_mask; @@ -28,14 +20,6 @@ int __devm_mdiobus_register(struct device * dev,struct mii_bus * bus,struct modu } -#include - -void __folio_put(struct folio * folio) -{ - lx_emul_trace_and_stop(__func__); -} - - #include int __ipv6_addr_type(const struct in6_addr * addr) diff --git a/repos/dde_linux/src/drivers/usb_net/spec/x86_64/generated_dummies.c b/repos/dde_linux/src/drivers/usb_net/spec/x86_64/generated_dummies.c index 2755d1b6ad..69c42aa87a 100644 --- a/repos/dde_linux/src/drivers/usb_net/spec/x86_64/generated_dummies.c +++ b/repos/dde_linux/src/drivers/usb_net/spec/x86_64/generated_dummies.c @@ -9,12 +9,6 @@ #include -struct page * __alloc_pages(gfp_t gfp,unsigned int order,int preferred_nid,nodemask_t * nodemask) -{ - lx_emul_trace_and_stop(__func__); -} - - #include struct cpumask __cpu_active_mask; @@ -28,14 +22,6 @@ int __devm_mdiobus_register(struct device * dev,struct mii_bus * bus,struct modu } -#include - -void __folio_put(struct folio * folio) -{ - lx_emul_trace_and_stop(__func__); -} - - #include int __ipv6_addr_type(const struct in6_addr * addr)