From cda0fafbd1987e40dbaae79356f91d9c243210c4 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Tue, 15 Mar 2022 09:40:50 +0100
Subject: [PATCH] lx_emul: remove sw_width/height from common_dummies

required by the new upcoming intel display driver. Make the step explicit,
because it needs adjustment on the new usb driver as well.

Issue #4450
---
 .../src/drivers/usb_host/pc/generated_dummies.c  | 16 ++++++++++++++++
 repos/pc/src/lib/pc/lx_emul/common_dummies.c     | 14 --------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/repos/pc/src/drivers/usb_host/pc/generated_dummies.c b/repos/pc/src/drivers/usb_host/pc/generated_dummies.c
index b69ed879e9..3bd20d3289 100644
--- a/repos/pc/src/drivers/usb_host/pc/generated_dummies.c
+++ b/repos/pc/src/drivers/usb_host/pc/generated_dummies.c
@@ -7,6 +7,22 @@
 #include <lx_emul.h>
 
 
+#include <linux/bitops.h>
+
+unsigned int __sw_hweight32(unsigned int w)
+{
+	lx_emul_trace_and_stop(__func__);
+}
+
+
+#include <linux/bitops.h>
+
+unsigned long __sw_hweight64(__u64 w)
+{
+	lx_emul_trace_and_stop(__func__);
+}
+
+
 #include <linux/proc_fs.h>
 
 void * PDE_DATA(const struct inode * inode)
diff --git a/repos/pc/src/lib/pc/lx_emul/common_dummies.c b/repos/pc/src/lib/pc/lx_emul/common_dummies.c
index d7afc19018..aff0b1fc56 100644
--- a/repos/pc/src/lib/pc/lx_emul/common_dummies.c
+++ b/repos/pc/src/lib/pc/lx_emul/common_dummies.c
@@ -22,20 +22,6 @@ char __end_rodata[]   = {};
 
 int __preempt_count = 0;
 
-#include <linux/bitops.h>
-
-unsigned int __sw_hweight32(__u32 w)
-{
-	lx_emul_trace_and_stop(__func__);
-}
-
-#include <linux/bitops.h>
-
-unsigned long __sw_hweight64(__u64 w)
-{
-	lx_emul_trace_and_stop(__func__);
-}
-
 
 #include <linux/prandom.h>