On Thu, Mar 14, 2024 at 10:41:12AM +0100, Helge Deller wrote: > Dear Greg & stable team, > > could you please queue up the patch below for the stable-6.7 kernel? > This is upstream commit: > eba38cc7578bef94865341c73608bdf49193a51d > > Thanks, > Helge I've already sent Greg a pull request with this patch - _twice_. > > > From eba38cc7578bef94865341c73608bdf49193a51d Mon Sep 17 00:00:00 2001 > From: Helge Deller <deller@xxxxxxxxxx> > Subject: [PATCH] bcachefs: Fix build on parisc by avoiding __multi3() > > The gcc compiler on paric does support the __int128 type, although the > architecture does not have native 128-bit support. > > The effect is, that the bcachefs u128_square() function will pull in the > libgcc __multi3() helper, which breaks the kernel build when bcachefs is > built as module since this function isn't currently exported in > arch/parisc/kernel/parisc_ksyms.c. > The build failure can be seen in the latest debian kernel build at: > https://buildd.debian.org/status/fetch.php?pkg=linux&arch=hppa&ver=6.7.1-1%7Eexp1&stamp=1706132569&raw=0 > > We prefer to not export that symbol, so fall back to the optional 64-bit > implementation provided by bcachefs and thus avoid usage of __multi3(). > > Signed-off-by: Helge Deller <deller@xxxxxx> > Cc: Kent Overstreet <kent.overstreet@xxxxxxxxx> > Signed-off-by: Kent Overstreet <kent.overstreet@xxxxxxxxx> > > diff --git a/fs/bcachefs/mean_and_variance.h b/fs/bcachefs/mean_and_variance.h > index b2be565bb8f2..64df11ab422b 100644 > --- a/fs/bcachefs/mean_and_variance.h > +++ b/fs/bcachefs/mean_and_variance.h > @@ -17,7 +17,7 @@ > * Rust and rustc has issues with u128. > */ > > -#if defined(__SIZEOF_INT128__) && defined(__KERNEL__) > +#if defined(__SIZEOF_INT128__) && defined(__KERNEL__) && !defined(CONFIG_PARISC) > > typedef struct { > unsigned __int128 v;
