Since the generic version of bug.h stuff was introduced it
is necessary to rename all uses of <asm/bug.h> to <xen/bug.h>

Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
 xen/drivers/cpufreq/cpufreq.c | 2 +-
 xen/include/xen/lib.h         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c
index a94520ee57..f290821a0e 100644
--- a/xen/drivers/cpufreq/cpufreq.c
+++ b/xen/drivers/cpufreq/cpufreq.c
@@ -39,7 +39,7 @@
 #include <xen/guest_access.h>
 #include <xen/domain.h>
 #include <xen/cpu.h>
-#include <asm/bug.h>
+#include <xen/bug.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 
diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h
index 05ee1e18af..e914ccade0 100644
--- a/xen/include/xen/lib.h
+++ b/xen/include/xen/lib.h
@@ -24,12 +24,12 @@
 
 #ifndef __ASSEMBLY__
 
+#include <xen/bug.h>
 #include <xen/inttypes.h>
 #include <xen/stdarg.h>
 #include <xen/types.h>
 #include <xen/xmalloc.h>
 #include <xen/string.h>
-#include <asm/bug.h>
 
 #define BUG_ON(p)  do { if (unlikely(p)) BUG();  } while (0)
 #define WARN_ON(p)  ({                  \
-- 
2.39.0

On 03.02.2023 18:05, Oleksii Kurochko wrote:
> Since the generic version of bug.h stuff was introduced it
> is necessary to rename all uses of <asm/bug.h> to <xen/bug.h>
> 
> Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>

Doesn't this change need to come ahead of at least what currently is patch 3?
Or else why do you say "necessary" (I take this to mean the build otherwise
is broken)? If the build works after patch 3, the change here may want to be
drop the unnecessary asm/bug.h includes instead.

Jan

On Mon, 2023-02-13 at 14:13 +0100, Jan Beulich wrote:
> On 03.02.2023 18:05, Oleksii Kurochko wrote:
> > Since the generic version of bug.h stuff was introduced it
> > is necessary to rename all uses of <asm/bug.h> to <xen/bug.h>
> > 
> > Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
> 
> Doesn't this change need to come ahead of at least what currently is
> patch 3?
> Or else why do you say "necessary" (I take this to mean the build
> otherwise
> is broken)? If the build works after patch 3, the change here may
> want to be
> drop the unnecessary asm/bug.h includes instead.
> 
I'll double-check if the build works after patch 3 and fix the comment.
Thanks for the comment.
> Jan

~Oleksii