Re: [tip:master 19/19] include/linux/irq-entry-common.h:201:2: error: unexpected token

[Nathan Chancellor <nathan@kernel.org>]

On Wed, Jul 02, 2025 at 06:10:12PM +0200, Peter Zijlstra wrote:
> On Wed, Jul 02, 2025 at 05:41:37PM +0200, Heiko Carstens wrote:
> > On Wed, Jul 02, 2025 at 05:07:39PM +0200, Peter Zijlstra wrote:
> > > > > > diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h
> > > > > > index a185855ab158..46d9eb64bd18 100644
> > > > > > --- a/arch/s390/include/asm/bug.h
> > > > > > +++ b/arch/s390/include/asm/bug.h
> > > > > > @@ -9,7 +9,7 @@
> > > > > >  #else
> > > > > >  #define __BUGVERBOSE_LOCATION(file, line)			\
> > > > > >  		.pushsection .rodata.str, "aMS", @progbits, 1;	\
> > > > > > -	10002:	.string file;					\
> > > > > > +	10002:	.ascii file;					\
> > > > > >  		.popsection;					\
> > > > > >  								\
> > > > > >  		.long 10002b - .;				\
> > > > > > 
> > > > > 
> > > > > IIUC this also needs a trailing "\0" as per the link above, or this
> > > > > won't get a NUL-terminator (but will build just fine).
> > > > 
> > > > Yup, I ran into this before. Let me go fix that commit.
> > > 
> > >  + e7e26cfad96c...2a20b2730147 core/bugs -> core/bugs (forced update)
> > 
> > Thank you! But wouldn't you also need to merge Nathan's patch [1] into
> > the loongarch commit (or maybe you are just about to do that)?
> > 
> > [1] https://lore.kernel.org/all/20250616-loongarch-fix-warn-cond-llvm-ias-v1-1-6c6d90bb4466@kernel.org/
> > [2] https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?h=core/bugs&id=5d476f66e6add0b709a09d60feecff3a2d156800
> 
> Uh, indeed. Let me go do so.

Thanks Peter. Did something go awry with the latest rebase? It looks
like current core/bugs has the loongarch issue fixed but "bugs/s390: Use
'cond_str' in __EMIT_BUG()" seems to have reverted to the broken
version?

diff --git a/tmp/.psub.eKGNE0S0Yf b/tmp/.psub.w9BLv9qXti
index 0fb363b71ebb..f3ce9e3ce952 100644
--- a/tmp/.psub.eKGNE0S0Yf
+++ b/tmp/.psub.w9BLv9qXti
@@ -1,8 +1,8 @@
-commit d9f685d24d69b6b64cecb3dd70d7e51836bf531f
+commit 6540db6ce800aaeedc8d733d1e6d2f1c83c7b217
 Author:     Heiko Carstens <hca@linux.ibm.com>
 AuthorDate: Tue May 20 15:39:27 2025 +0200
 Commit:     Peter Zijlstra <peterz@infradead.org>
-CommitDate: Wed Jul 2 16:55:06 2025 +0200
+CommitDate: Wed Jul 2 18:16:12 2025 +0200
 
     bugs/s390: Use 'cond_str' in __EMIT_BUG()
     
@@ -32,7 +32,7 @@ CommitDate: Wed Jul 2 16:55:06 2025 +0200
     Link: https://lore.kernel.org/r/20250617135042.1878068-3-hca@linux.ibm.com
 
 diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h
-index 30f8785a01f5..c39500eec300 100644
+index 30f8785a01f5..0c808dadbc22 100644
 --- a/arch/s390/include/asm/bug.h
 +++ b/arch/s390/include/asm/bug.h
 @@ -2,52 +2,52 @@
@@ -48,7 +48,7 @@ index 30f8785a01f5..c39500eec300 100644
 +#else
 +#define __BUGVERBOSE_LOCATION(file, line)			\
 +		.pushsection .rodata.str, "aMS", @progbits, 1;	\
-+	10002:	.ascii file "\0";				\
++	10002:	.string file;					\
 +		.popsection;					\
 +								\
 +		.long 10002b - .;				\