* linux-next: build failure after merge of the s390 tree
@ 2011-05-20 1:56 Stephen Rothwell
2011-05-20 9:24 ` Martin Schwidefsky
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-05-20 1:56 UTC (permalink / raw)
To: Martin Schwidefsky, Heiko Carstens; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 957 bytes --]
Hi all,
After merging the s390 tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
mm/rmap.c:788:54: error: macro "page_test_and_clear_dirty" passed 2 arguments, but takes just 1
mm/rmap.c: In function 'page_mkclean':
mm/rmap.c:788: error: 'page_test_and_clear_dirty' undeclared (first use in this function)
mm/rmap.c:788: error: (Each undeclared identifier is reported only once
mm/rmap.c:788: error: for each function it appears in.)
mm/rmap.c:983:52: error: macro "page_test_and_clear_dirty" passed 2 arguments, but takes just 1
mm/rmap.c: In function 'page_remove_rmap':
mm/rmap.c:983: error: 'page_test_and_clear_dirty' undeclared (first use in this function)
Caused by commit 4cbfc8b9f58c ("[S390] merge page_test_dirty and page_clear_dirty").
I have used the s390 tree from next-20110519 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the s390 tree
2011-05-20 1:56 linux-next: build failure after merge of the s390 tree Stephen Rothwell
@ 2011-05-20 9:24 ` Martin Schwidefsky
0 siblings, 0 replies; 6+ messages in thread
From: Martin Schwidefsky @ 2011-05-20 9:24 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Heiko Carstens, linux-next, linux-kernel
On Fri, 20 May 2011 11:56:51 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> After merging the s390 tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> mm/rmap.c:788:54: error: macro "page_test_and_clear_dirty" passed 2 arguments, but takes just 1
> mm/rmap.c: In function 'page_mkclean':
> mm/rmap.c:788: error: 'page_test_and_clear_dirty' undeclared (first use in this function)
> mm/rmap.c:788: error: (Each undeclared identifier is reported only once
> mm/rmap.c:788: error: for each function it appears in.)
> mm/rmap.c:983:52: error: macro "page_test_and_clear_dirty" passed 2 arguments, but takes just 1
> mm/rmap.c: In function 'page_remove_rmap':
> mm/rmap.c:983: error: 'page_test_and_clear_dirty' undeclared (first use in this function)
>
> Caused by commit 4cbfc8b9f58c ("[S390] merge page_test_dirty and page_clear_dirty").
>
> I have used the s390 tree from next-20110519 for today.
Oops, sorry about that. Fixed the patch and updated git390.
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: build failure after merge of the s390 tree
@ 2023-01-10 9:22 Stephen Rothwell
2023-01-10 14:22 ` Heiko Carstens
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2023-01-10 9:22 UTC (permalink / raw)
To: Heiko Carstens, Vasily Gorbik, Christian Borntraeger
Cc: Sven Schnelle, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
Hi all,
After merging the s390 tree, today's linux-next build (s390 allmodconfig)
failed like this:
drivers/s390/char/con3270.c:43:24: error: 'condev' defined but not used [-Werror=unused-variable]
static struct tty3270 *condev;
^~~~~~
Caused by commit
c17fe081ac1f ("s390/3270: unify con3270 + tty3270")
--
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 s390 tree
2023-01-10 9:22 Stephen Rothwell
@ 2023-01-10 14:22 ` Heiko Carstens
0 siblings, 0 replies; 6+ messages in thread
From: Heiko Carstens @ 2023-01-10 14:22 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Vasily Gorbik, Christian Borntraeger, Sven Schnelle,
Linux Kernel Mailing List, Linux Next Mailing List
On Tue, Jan 10, 2023 at 08:22:21PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the s390 tree, today's linux-next build (s390 allmodconfig)
> failed like this:
>
> drivers/s390/char/con3270.c:43:24: error: 'condev' defined but not used [-Werror=unused-variable]
> static struct tty3270 *condev;
> ^~~~~~
>
> Caused by commit
>
> c17fe081ac1f ("s390/3270: unify con3270 + tty3270")
Thank you for reporting. This should be fixed now:
https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git/commit/?h=features&id=9cab4f7d98eee90b762ffbc87055c9499d51a635
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: build failure after merge of the s390 tree
@ 2024-08-08 3:58 Stephen Rothwell
2024-09-11 8:09 ` Stephen Rothwell
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2024-08-08 3:58 UTC (permalink / raw)
To: Heiko Carstens, Vasily Gorbik, Christian Borntraeger,
Andrew Morton
Cc: Danilo Krummrich, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 4068 bytes --]
Hi all,
After merging the s390 tree, today's linux-next build (s390 defconfig)
failed like this:
In file included from include/linux/percpu.h:5,
from include/linux/percpu_counter.h:14,
from include/linux/mm_types.h:21,
from include/linux/ptdump.h:6,
from arch/s390/mm/dump_pagetables.c:3:
arch/s390/mm/dump_pagetables.c: In function 'add_marker':
include/linux/slab.h:848:61: error: too many arguments to function 'kvrealloc_noprof'
848 | #define kvrealloc(...) alloc_hooks(kvrealloc_noprof(__VA_ARGS__))
| ^~~~~~~~~~~~~~~~
include/linux/alloc_tag.h:206:16: note: in definition of macro 'alloc_hooks_tag'
206 | typeof(_do_alloc) _res = _do_alloc; \
| ^~~~~~~~~
include/linux/slab.h:848:49: note: in expansion of macro 'alloc_hooks'
848 | #define kvrealloc(...) alloc_hooks(kvrealloc_noprof(__VA_ARGS__))
| ^~~~~~~~~~~
arch/s390/mm/dump_pagetables.c:259:27: note: in expansion of macro 'kvrealloc'
259 | markers = kvrealloc(markers, oldsize, newsize, GFP_KERNEL);
| ^~~~~~~~~
In file included from include/linux/fs.h:45,
from include/linux/seq_file.h:11,
from arch/s390/mm/dump_pagetables.c:4:
include/linux/slab.h:846:7: note: declared here
846 | void *kvrealloc_noprof(const void *p, size_t size, gfp_t flags)
| ^~~~~~~~~~~~~~~~
include/linux/slab.h:848:61: error: too many arguments to function 'kvrealloc_noprof'
848 | #define kvrealloc(...) alloc_hooks(kvrealloc_noprof(__VA_ARGS__))
| ^~~~~~~~~~~~~~~~
include/linux/alloc_tag.h:206:34: note: in definition of macro 'alloc_hooks_tag'
206 | typeof(_do_alloc) _res = _do_alloc; \
| ^~~~~~~~~
include/linux/slab.h:848:49: note: in expansion of macro 'alloc_hooks'
848 | #define kvrealloc(...) alloc_hooks(kvrealloc_noprof(__VA_ARGS__))
| ^~~~~~~~~~~
arch/s390/mm/dump_pagetables.c:259:27: note: in expansion of macro 'kvrealloc'
259 | markers = kvrealloc(markers, oldsize, newsize, GFP_KERNEL);
| ^~~~~~~~~
include/linux/slab.h:846:7: note: declared here
846 | void *kvrealloc_noprof(const void *p, size_t size, gfp_t flags)
| ^~~~~~~~~~~~~~~~
Caused by commit
d0e7915d2ad3 ("s390/mm/ptdump: Generate address marker array dynamically")
interacting with commit
d4a913add37d ("mm: kvmalloc: align kvrealloc() with krealloc()")
from the mm-unstable branch of the mm tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Aug 2024 13:50:39 +1000
Subject: [PATCH] fixup for "s390/mm/ptdump: Generate address marker array dynamically"
interacting with "mm: kvmalloc: align kvrealloc() with krealloc()"
from the mm tree.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/s390/mm/dump_pagetables.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/s390/mm/dump_pagetables.c b/arch/s390/mm/dump_pagetables.c
index 9e2dc42143b3..fa54f3bc0c8d 100644
--- a/arch/s390/mm/dump_pagetables.c
+++ b/arch/s390/mm/dump_pagetables.c
@@ -256,7 +256,7 @@ static int add_marker(unsigned long start, unsigned long end, const char *name)
if (!oldsize)
markers = kvmalloc(newsize, GFP_KERNEL);
else
- markers = kvrealloc(markers, oldsize, newsize, GFP_KERNEL);
+ markers = kvrealloc(markers, newsize, GFP_KERNEL);
if (!markers)
goto error;
markers[markers_cnt].is_start = 1;
--
2.43.0
--
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 s390 tree
2024-08-08 3:58 Stephen Rothwell
@ 2024-09-11 8:09 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2024-09-11 8:09 UTC (permalink / raw)
To: Heiko Carstens, Vasily Gorbik, Christian Borntraeger,
Andrew Morton
Cc: Danilo Krummrich, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 4370 bytes --]
Hi all,
Just a reminder for the upcoming merge window ...
On Thu, 8 Aug 2024 13:58:36 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the s390 tree, today's linux-next build (s390 defconfig)
> failed like this:
>
> In file included from include/linux/percpu.h:5,
> from include/linux/percpu_counter.h:14,
> from include/linux/mm_types.h:21,
> from include/linux/ptdump.h:6,
> from arch/s390/mm/dump_pagetables.c:3:
> arch/s390/mm/dump_pagetables.c: In function 'add_marker':
> include/linux/slab.h:848:61: error: too many arguments to function 'kvrealloc_noprof'
> 848 | #define kvrealloc(...) alloc_hooks(kvrealloc_noprof(__VA_ARGS__))
> | ^~~~~~~~~~~~~~~~
> include/linux/alloc_tag.h:206:16: note: in definition of macro 'alloc_hooks_tag'
> 206 | typeof(_do_alloc) _res = _do_alloc; \
> | ^~~~~~~~~
> include/linux/slab.h:848:49: note: in expansion of macro 'alloc_hooks'
> 848 | #define kvrealloc(...) alloc_hooks(kvrealloc_noprof(__VA_ARGS__))
> | ^~~~~~~~~~~
> arch/s390/mm/dump_pagetables.c:259:27: note: in expansion of macro 'kvrealloc'
> 259 | markers = kvrealloc(markers, oldsize, newsize, GFP_KERNEL);
> | ^~~~~~~~~
> In file included from include/linux/fs.h:45,
> from include/linux/seq_file.h:11,
> from arch/s390/mm/dump_pagetables.c:4:
> include/linux/slab.h:846:7: note: declared here
> 846 | void *kvrealloc_noprof(const void *p, size_t size, gfp_t flags)
> | ^~~~~~~~~~~~~~~~
> include/linux/slab.h:848:61: error: too many arguments to function 'kvrealloc_noprof'
> 848 | #define kvrealloc(...) alloc_hooks(kvrealloc_noprof(__VA_ARGS__))
> | ^~~~~~~~~~~~~~~~
> include/linux/alloc_tag.h:206:34: note: in definition of macro 'alloc_hooks_tag'
> 206 | typeof(_do_alloc) _res = _do_alloc; \
> | ^~~~~~~~~
> include/linux/slab.h:848:49: note: in expansion of macro 'alloc_hooks'
> 848 | #define kvrealloc(...) alloc_hooks(kvrealloc_noprof(__VA_ARGS__))
> | ^~~~~~~~~~~
> arch/s390/mm/dump_pagetables.c:259:27: note: in expansion of macro 'kvrealloc'
> 259 | markers = kvrealloc(markers, oldsize, newsize, GFP_KERNEL);
> | ^~~~~~~~~
> include/linux/slab.h:846:7: note: declared here
> 846 | void *kvrealloc_noprof(const void *p, size_t size, gfp_t flags)
> | ^~~~~~~~~~~~~~~~
>
> Caused by commit
>
> d0e7915d2ad3 ("s390/mm/ptdump: Generate address marker array dynamically")
>
> interacting with commit
>
> d4a913add37d ("mm: kvmalloc: align kvrealloc() with krealloc()")
>
> from the mm-unstable branch of the mm tree.
>
> I have applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 8 Aug 2024 13:50:39 +1000
> Subject: [PATCH] fixup for "s390/mm/ptdump: Generate address marker array dynamically"
>
> interacting with "mm: kvmalloc: align kvrealloc() with krealloc()"
> from the mm tree.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/s390/mm/dump_pagetables.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/mm/dump_pagetables.c b/arch/s390/mm/dump_pagetables.c
> index 9e2dc42143b3..fa54f3bc0c8d 100644
> --- a/arch/s390/mm/dump_pagetables.c
> +++ b/arch/s390/mm/dump_pagetables.c
> @@ -256,7 +256,7 @@ static int add_marker(unsigned long start, unsigned long end, const char *name)
> if (!oldsize)
> markers = kvmalloc(newsize, GFP_KERNEL);
> else
> - markers = kvrealloc(markers, oldsize, newsize, GFP_KERNEL);
> + markers = kvrealloc(markers, newsize, GFP_KERNEL);
> if (!markers)
> goto error;
> markers[markers_cnt].is_start = 1;
> --
> 2.43.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-09-11 8:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-20 1:56 linux-next: build failure after merge of the s390 tree Stephen Rothwell
2011-05-20 9:24 ` Martin Schwidefsky
-- strict thread matches above, loose matches on Subject: below --
2023-01-10 9:22 Stephen Rothwell
2023-01-10 14:22 ` Heiko Carstens
2024-08-08 3:58 Stephen Rothwell
2024-09-11 8:09 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox