* linux-next: build failure after merge of the header_cleanup tree
@ 2023-12-19 4:25 Stephen Rothwell
2023-12-19 4:59 ` Kent Overstreet
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2023-12-19 4:25 UTC (permalink / raw)
To: Kent Overstreet; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1269 bytes --]
Hi all,
After merging the header_cleanup tree, today's linux-next build (s390
defconfig) failed like this:
arch/s390/kernel/signal.c: In function 'arch_do_signal_or_restart':
arch/s390/kernel/signal.c:491:17: error: implicit declaration of function 'rseq_signal_deliver' [-Werror=implicit-function-declaration]
491 | rseq_signal_deliver(&ksig, regs);
| ^~~~~~~~~~~~~~~~~~~
Presumably caused by commit
cd1146fc0ad3 ("rseq: Split out rseq.h from sched.h")
I have applied the following patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 19 Dec 2023 15:19:02 +1100
Subject: [PATCH] fixup for s390 and "rseq: Split out rseq.h from sched.h"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/s390/kernel/signal.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index 27bcc43fe1b7..43e9661cd715 100644
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -12,6 +12,7 @@
#include <linux/sched.h>
#include <linux/sched/task_stack.h>
+#include <linux/rseq.h>
#include <linux/mm.h>
#include <linux/smp.h>
#include <linux/kernel.h>
--
2.40.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: linux-next: build failure after merge of the header_cleanup tree
2023-12-19 4:25 linux-next: build failure after merge of the header_cleanup tree Stephen Rothwell
@ 2023-12-19 4:59 ` Kent Overstreet
0 siblings, 0 replies; 6+ messages in thread
From: Kent Overstreet @ 2023-12-19 4:59 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
On Tue, Dec 19, 2023 at 03:25:45PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the header_cleanup tree, today's linux-next build (s390
> defconfig) failed like this:
>
> arch/s390/kernel/signal.c: In function 'arch_do_signal_or_restart':
> arch/s390/kernel/signal.c:491:17: error: implicit declaration of function 'rseq_signal_deliver' [-Werror=implicit-function-declaration]
> 491 | rseq_signal_deliver(&ksig, regs);
> | ^~~~~~~~~~~~~~~~~~~
>
> Presumably caused by commit
>
> cd1146fc0ad3 ("rseq: Split out rseq.h from sched.h")
>
> I have applied the following patch for today:
I've applied the same fixup to my tree.
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: build failure after merge of the header_cleanup tree
@ 2023-12-18 6:40 Stephen Rothwell
2023-12-19 3:57 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2023-12-18 6:40 UTC (permalink / raw)
To: Kent Overstreet; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 4030 bytes --]
Hi all,
After merging the header_cleanup tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
In file included from include/linux/kernel.h:27,
from drivers/gpu/ipu-v3/ipu-dp.c:7:
include/drm/drm_color_mgmt.h: In function 'drm_color_lut_extract':
include/drm/drm_color_mgmt.h:45:46: error: implicit declaration of function 'mul_u32_u32' [-Werror=implicit-function-declaration]
45 | return DIV_ROUND_CLOSEST_ULL(mul_u32_u32(user_input, (1 << bit_precision) - 1),
| ^~~~~~~~~~~
include/linux/math.h:104:36: note: in definition of macro 'DIV_ROUND_CLOSEST_ULL'
104 | unsigned long long _tmp = (x) + (__d) / 2; \
| ^
In file included from include/linux/time.h:6,
from include/linux/videodev2.h:59,
from include/video/imx-ipu-v3.h:16,
from drivers/gpu/ipu-v3/ipu-dp.c:14:
include/linux/math64.h: At top level:
include/linux/math64.h:155:19: error: conflicting types for 'mul_u32_u32'; have 'u64(u32, u32)' {aka 'long long unsigned int(unsigned int, unsigned int)'}
155 | static inline u64 mul_u32_u32(u32 a, u32 b)
| ^~~~~~~~~~~
include/drm/drm_color_mgmt.h:45:46: note: previous implicit declaration of 'mul_u32_u32' with type 'int()'
45 | return DIV_ROUND_CLOSEST_ULL(mul_u32_u32(user_input, (1 << bit_precision) - 1),
| ^~~~~~~~~~~
include/linux/math.h:104:36: note: in definition of macro 'DIV_ROUND_CLOSEST_ULL'
104 | unsigned long long _tmp = (x) + (__d) / 2; \
| ^
cc1: some warnings being treated as errors
In file included from include/linux/kernel.h:27,
from drivers/gpu/drm/omapdrm/dss/dispc_coefs.c:7:
include/drm/drm_color_mgmt.h: In function 'drm_color_lut_extract':
include/drm/drm_color_mgmt.h:45:46: error: implicit declaration of function 'mul_u32_u32' [-Werror=implicit-function-declaration]
45 | return DIV_ROUND_CLOSEST_ULL(mul_u32_u32(user_input, (1 << bit_precision) - 1),
| ^~~~~~~~~~~
include/linux/math.h:104:36: note: in definition of macro 'DIV_ROUND_CLOSEST_ULL'
104 | unsigned long long _tmp = (x) + (__d) / 2; \
| ^
In file included from include/linux/jiffies.h:7,
from include/linux/ktime.h:25,
from include/linux/timer.h:6,
from include/linux/workqueue.h:9,
from include/linux/mm_types.h:19,
from include/linux/mmzone.h:22,
from include/linux/gfp.h:7,
from include/linux/stackdepot.h:25,
from include/drm/drm_modeset_lock.h:28,
from include/drm/drm_crtc.h:30,
from drivers/gpu/drm/omapdrm/dss/omapdss.h:11,
from drivers/gpu/drm/omapdrm/dss/dispc_coefs.c:9:
include/linux/math64.h: At top level:
include/linux/math64.h:155:19: error: conflicting types for 'mul_u32_u32'; have 'u64(u32, u32)' {aka 'long long unsigned int(unsigned int, unsigned int)'}
155 | static inline u64 mul_u32_u32(u32 a, u32 b)
| ^~~~~~~~~~~
include/drm/drm_color_mgmt.h:45:46: note: previous implicit declaration of 'mul_u32_u32' with type 'int()'
45 | return DIV_ROUND_CLOSEST_ULL(mul_u32_u32(user_input, (1 << bit_precision) - 1),
| ^~~~~~~~~~~
include/linux/math.h:104:36: note: in definition of macro 'DIV_ROUND_CLOSEST_ULL'
104 | unsigned long long _tmp = (x) + (__d) / 2; \
| ^
cc1: some warnings being treated as errors
I have dropped the header_cleanup tree for today.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: build failure after merge of the header_cleanup tree
2023-12-18 6:40 Stephen Rothwell
@ 2023-12-19 3:57 ` Stephen Rothwell
2023-12-19 13:53 ` Ville Syrjälä
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2023-12-19 3:57 UTC (permalink / raw)
To: Kent Overstreet, Dave Airlie
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Ville Syrjälä,
DRI
[-- Attachment #1: Type: text/plain, Size: 5629 bytes --]
Hi all,
On Mon, 18 Dec 2023 17:40:30 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the header_cleanup tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from include/linux/kernel.h:27,
> from drivers/gpu/ipu-v3/ipu-dp.c:7:
> include/drm/drm_color_mgmt.h: In function 'drm_color_lut_extract':
> include/drm/drm_color_mgmt.h:45:46: error: implicit declaration of function 'mul_u32_u32' [-Werror=implicit-function-declaration]
> 45 | return DIV_ROUND_CLOSEST_ULL(mul_u32_u32(user_input, (1 << bit_precision) - 1),
> | ^~~~~~~~~~~
> include/linux/math.h:104:36: note: in definition of macro 'DIV_ROUND_CLOSEST_ULL'
> 104 | unsigned long long _tmp = (x) + (__d) / 2; \
> | ^
> In file included from include/linux/time.h:6,
> from include/linux/videodev2.h:59,
> from include/video/imx-ipu-v3.h:16,
> from drivers/gpu/ipu-v3/ipu-dp.c:14:
> include/linux/math64.h: At top level:
> include/linux/math64.h:155:19: error: conflicting types for 'mul_u32_u32'; have 'u64(u32, u32)' {aka 'long long unsigned int(unsigned int, unsigned int)'}
> 155 | static inline u64 mul_u32_u32(u32 a, u32 b)
> | ^~~~~~~~~~~
> include/drm/drm_color_mgmt.h:45:46: note: previous implicit declaration of 'mul_u32_u32' with type 'int()'
> 45 | return DIV_ROUND_CLOSEST_ULL(mul_u32_u32(user_input, (1 << bit_precision) - 1),
> | ^~~~~~~~~~~
> include/linux/math.h:104:36: note: in definition of macro 'DIV_ROUND_CLOSEST_ULL'
> 104 | unsigned long long _tmp = (x) + (__d) / 2; \
> | ^
> cc1: some warnings being treated as errors
> In file included from include/linux/kernel.h:27,
> from drivers/gpu/drm/omapdrm/dss/dispc_coefs.c:7:
> include/drm/drm_color_mgmt.h: In function 'drm_color_lut_extract':
> include/drm/drm_color_mgmt.h:45:46: error: implicit declaration of function 'mul_u32_u32' [-Werror=implicit-function-declaration]
> 45 | return DIV_ROUND_CLOSEST_ULL(mul_u32_u32(user_input, (1 << bit_precision) - 1),
> | ^~~~~~~~~~~
> include/linux/math.h:104:36: note: in definition of macro 'DIV_ROUND_CLOSEST_ULL'
> 104 | unsigned long long _tmp = (x) + (__d) / 2; \
> | ^
> In file included from include/linux/jiffies.h:7,
> from include/linux/ktime.h:25,
> from include/linux/timer.h:6,
> from include/linux/workqueue.h:9,
> from include/linux/mm_types.h:19,
> from include/linux/mmzone.h:22,
> from include/linux/gfp.h:7,
> from include/linux/stackdepot.h:25,
> from include/drm/drm_modeset_lock.h:28,
> from include/drm/drm_crtc.h:30,
> from drivers/gpu/drm/omapdrm/dss/omapdss.h:11,
> from drivers/gpu/drm/omapdrm/dss/dispc_coefs.c:9:
> include/linux/math64.h: At top level:
> include/linux/math64.h:155:19: error: conflicting types for 'mul_u32_u32'; have 'u64(u32, u32)' {aka 'long long unsigned int(unsigned int, unsigned int)'}
> 155 | static inline u64 mul_u32_u32(u32 a, u32 b)
> | ^~~~~~~~~~~
> include/drm/drm_color_mgmt.h:45:46: note: previous implicit declaration of 'mul_u32_u32' with type 'int()'
> 45 | return DIV_ROUND_CLOSEST_ULL(mul_u32_u32(user_input, (1 << bit_precision) - 1),
> | ^~~~~~~~~~~
> include/linux/math.h:104:36: note: in definition of macro 'DIV_ROUND_CLOSEST_ULL'
> 104 | unsigned long long _tmp = (x) + (__d) / 2; \
> | ^
> cc1: some warnings being treated as errors
This turns out to be a semantic conflict (or exposing a bug in commit
c6fbb6bca108 ("drm: Fix color LUT rounding")
from the drm tree.
I have applied the following merge fix up patch (which should probably
be applied to the drm tree, if possible).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 19 Dec 2023 14:43:41 +1100
Subject: [PATCH] drm: using mul_u32_u32() requires linux/math64.h
Some pending include file cleanups produced this error:
In file included from include/linux/kernel.h:27,
from drivers/gpu/ipu-v3/ipu-dp.c:7:
include/drm/drm_color_mgmt.h: In function 'drm_color_lut_extract':
include/drm/drm_color_mgmt.h:45:46: error: implicit declaration of function 'mul_u32_u32' [-Werror=implicit-function-declaration]
45 | return DIV_ROUND_CLOSEST_ULL(mul_u32_u32(user_input, (1 << bit_precision) - 1),
| ^~~~~~~~~~~
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/drm/drm_color_mgmt.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/drm/drm_color_mgmt.h b/include/drm/drm_color_mgmt.h
index 54b2b2467bfd..ed81741036d7 100644
--- a/include/drm/drm_color_mgmt.h
+++ b/include/drm/drm_color_mgmt.h
@@ -24,6 +24,7 @@
#define __DRM_COLOR_MGMT_H__
#include <linux/ctype.h>
+#include <linux/math64.h>
#include <drm/drm_property.h>
struct drm_crtc;
--
2.40.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: linux-next: build failure after merge of the header_cleanup tree
2023-12-19 3:57 ` Stephen Rothwell
@ 2023-12-19 13:53 ` Ville Syrjälä
0 siblings, 0 replies; 6+ messages in thread
From: Ville Syrjälä @ 2023-12-19 13:53 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Kent Overstreet, Dave Airlie, Linux Kernel Mailing List,
Linux Next Mailing List, DRI
On Tue, Dec 19, 2023 at 02:57:34PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 18 Dec 2023 17:40:30 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the header_cleanup tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > In file included from include/linux/kernel.h:27,
> > from drivers/gpu/ipu-v3/ipu-dp.c:7:
> > include/drm/drm_color_mgmt.h: In function 'drm_color_lut_extract':
> > include/drm/drm_color_mgmt.h:45:46: error: implicit declaration of function 'mul_u32_u32' [-Werror=implicit-function-declaration]
> > 45 | return DIV_ROUND_CLOSEST_ULL(mul_u32_u32(user_input, (1 << bit_precision) - 1),
> > | ^~~~~~~~~~~
> > include/linux/math.h:104:36: note: in definition of macro 'DIV_ROUND_CLOSEST_ULL'
> > 104 | unsigned long long _tmp = (x) + (__d) / 2; \
> > | ^
> > In file included from include/linux/time.h:6,
> > from include/linux/videodev2.h:59,
> > from include/video/imx-ipu-v3.h:16,
> > from drivers/gpu/ipu-v3/ipu-dp.c:14:
> > include/linux/math64.h: At top level:
> > include/linux/math64.h:155:19: error: conflicting types for 'mul_u32_u32'; have 'u64(u32, u32)' {aka 'long long unsigned int(unsigned int, unsigned int)'}
> > 155 | static inline u64 mul_u32_u32(u32 a, u32 b)
> > | ^~~~~~~~~~~
> > include/drm/drm_color_mgmt.h:45:46: note: previous implicit declaration of 'mul_u32_u32' with type 'int()'
> > 45 | return DIV_ROUND_CLOSEST_ULL(mul_u32_u32(user_input, (1 << bit_precision) - 1),
> > | ^~~~~~~~~~~
> > include/linux/math.h:104:36: note: in definition of macro 'DIV_ROUND_CLOSEST_ULL'
> > 104 | unsigned long long _tmp = (x) + (__d) / 2; \
> > | ^
> > cc1: some warnings being treated as errors
> > In file included from include/linux/kernel.h:27,
> > from drivers/gpu/drm/omapdrm/dss/dispc_coefs.c:7:
> > include/drm/drm_color_mgmt.h: In function 'drm_color_lut_extract':
> > include/drm/drm_color_mgmt.h:45:46: error: implicit declaration of function 'mul_u32_u32' [-Werror=implicit-function-declaration]
> > 45 | return DIV_ROUND_CLOSEST_ULL(mul_u32_u32(user_input, (1 << bit_precision) - 1),
> > | ^~~~~~~~~~~
> > include/linux/math.h:104:36: note: in definition of macro 'DIV_ROUND_CLOSEST_ULL'
> > 104 | unsigned long long _tmp = (x) + (__d) / 2; \
> > | ^
> > In file included from include/linux/jiffies.h:7,
> > from include/linux/ktime.h:25,
> > from include/linux/timer.h:6,
> > from include/linux/workqueue.h:9,
> > from include/linux/mm_types.h:19,
> > from include/linux/mmzone.h:22,
> > from include/linux/gfp.h:7,
> > from include/linux/stackdepot.h:25,
> > from include/drm/drm_modeset_lock.h:28,
> > from include/drm/drm_crtc.h:30,
> > from drivers/gpu/drm/omapdrm/dss/omapdss.h:11,
> > from drivers/gpu/drm/omapdrm/dss/dispc_coefs.c:9:
> > include/linux/math64.h: At top level:
> > include/linux/math64.h:155:19: error: conflicting types for 'mul_u32_u32'; have 'u64(u32, u32)' {aka 'long long unsigned int(unsigned int, unsigned int)'}
> > 155 | static inline u64 mul_u32_u32(u32 a, u32 b)
> > | ^~~~~~~~~~~
> > include/drm/drm_color_mgmt.h:45:46: note: previous implicit declaration of 'mul_u32_u32' with type 'int()'
> > 45 | return DIV_ROUND_CLOSEST_ULL(mul_u32_u32(user_input, (1 << bit_precision) - 1),
> > | ^~~~~~~~~~~
> > include/linux/math.h:104:36: note: in definition of macro 'DIV_ROUND_CLOSEST_ULL'
> > 104 | unsigned long long _tmp = (x) + (__d) / 2; \
> > | ^
> > cc1: some warnings being treated as errors
>
> This turns out to be a semantic conflict (or exposing a bug in commit
>
> c6fbb6bca108 ("drm: Fix color LUT rounding")
>
> from the drm tree.
>
> I have applied the following merge fix up patch (which should probably
> be applied to the drm tree, if possible).
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 19 Dec 2023 14:43:41 +1100
> Subject: [PATCH] drm: using mul_u32_u32() requires linux/math64.h
>
> Some pending include file cleanups produced this error:
>
> In file included from include/linux/kernel.h:27,
> from drivers/gpu/ipu-v3/ipu-dp.c:7:
> include/drm/drm_color_mgmt.h: In function 'drm_color_lut_extract':
> include/drm/drm_color_mgmt.h:45:46: error: implicit declaration of function 'mul_u32_u32' [-Werror=implicit-function-declaration]
> 45 | return DIV_ROUND_CLOSEST_ULL(mul_u32_u32(user_input, (1 << bit_precision) - 1),
> | ^~~~~~~~~~~
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Mea culpa.
I slapped on a
Fixes: c6fbb6bca108 ("drm: Fix color LUT rounding")
and applied this to drm-misc-next-fixes. Thanks.
> ---
> include/drm/drm_color_mgmt.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/include/drm/drm_color_mgmt.h b/include/drm/drm_color_mgmt.h
> index 54b2b2467bfd..ed81741036d7 100644
> --- a/include/drm/drm_color_mgmt.h
> +++ b/include/drm/drm_color_mgmt.h
> @@ -24,6 +24,7 @@
> #define __DRM_COLOR_MGMT_H__
>
> #include <linux/ctype.h>
> +#include <linux/math64.h>
> #include <drm/drm_property.h>
>
> struct drm_crtc;
> --
> 2.40.1
>
> --
> Cheers,
> Stephen Rothwell
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: build failure after merge of the header_cleanup tree
@ 2023-12-18 6:29 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2023-12-18 6:29 UTC (permalink / raw)
To: Kent Overstreet; +Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 3451 bytes --]
Hi all,
After merging the header_cleanup tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
In file included from include/linux/uaccess.h:12,
from include/linux/uio.h:9,
from include/linux/socket.h:8,
from include/linux/compat.h:15,
from arch/powerpc/kernel/asm-offsets.c:12:
arch/powerpc/include/asm/uaccess.h: In function 'copy_mc_to_user':
arch/powerpc/include/asm/uaccess.h:374:13: error: implicit declaration of function 'check_copy_size' [-Werror=implicit-function-declaration]
374 | if (check_copy_size(from, n, true)) {
| ^~~~~~~~~~~~~~~
include/linux/uaccess.h: At top level:
include/linux/uaccess.h:66:1: error: conflicting types for 'check_copy_size'; have 'bool(const void *, size_t, bool)' {aka '_Bool(const void *, long unsigned int, _Bool)'}
66 | check_copy_size(const void *addr, size_t bytes, bool is_source)
| ^~~~~~~~~~~~~~~
arch/powerpc/include/asm/uaccess.h:374:13: note: previous implicit declaration of 'check_copy_size' with type 'int()'
374 | if (check_copy_size(from, n, true)) {
| ^~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
Caused/exposed by commit
f95cbe69154f ("thread_info, uaccess.h: Move HARDENED_USERCOPY to better location")
I have reverted that commit for today.
I then got this:
arch/powerpc/kvm/book3s_64_vio.c: In function 'kvm_spapr_tce_release_iommu_group':
arch/powerpc/kvm/book3s_64_vio.c:103:17: error: implicit declaration of function 'cond_resched_rcu'; did you mean 'cond_resched_lock'? [-Werror=implicit-function-declaration]
103 | cond_resched_rcu();
| ^~~~~~~~~~~~~~~~
| cond_resched_lock
cc1: all warnings being treated as errors
and this:
arch/powerpc/kernel/interrupt.c: In function 'syscall_exit_prepare':
arch/powerpc/kernel/interrupt.c:275:9: error: implicit declaration of function 'rseq_syscall'; did you mean 'si_syscall'? [-Werror=implicit-function-declaration]
275 | rseq_syscall(regs);
| ^~~~~~~~~~~~
| si_syscall
cc1: all warnings being treated as errors
For which I applied this:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 18 Dec 2023 17:26:13 +1100
Subject: [PATCH] fix up for some header_claenup patches
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/kernel/interrupt.c | 1 +
arch/powerpc/kvm/book3s_64_vio.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/powerpc/kernel/interrupt.c b/arch/powerpc/kernel/interrupt.c
index c4f6d3c69ba9..94e9e2cdc557 100644
--- a/arch/powerpc/kernel/interrupt.c
+++ b/arch/powerpc/kernel/interrupt.c
@@ -4,6 +4,7 @@
#include <linux/err.h>
#include <linux/compat.h>
#include <linux/sched/debug.h> /* for show_regs */
+#include <linux/rseq.h>
#include <asm/kup.h>
#include <asm/cputime.h>
diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c
index 14c6d7e318da..b569ebaa590e 100644
--- a/arch/powerpc/kvm/book3s_64_vio.c
+++ b/arch/powerpc/kvm/book3s_64_vio.c
@@ -20,6 +20,7 @@
#include <linux/iommu.h>
#include <linux/file.h>
#include <linux/mm.h>
+#include <linux/rcupdate_wait.h>
#include <asm/kvm_ppc.h>
#include <asm/kvm_book3s.h>
--
2.40.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-12-19 13:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-19 4:25 linux-next: build failure after merge of the header_cleanup tree Stephen Rothwell
2023-12-19 4:59 ` Kent Overstreet
-- strict thread matches above, loose matches on Subject: below --
2023-12-18 6:40 Stephen Rothwell
2023-12-19 3:57 ` Stephen Rothwell
2023-12-19 13:53 ` Ville Syrjälä
2023-12-18 6:29 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).