On Wed, Dec 15, 2021 at 04:45:00PM +0800, Huang Pei wrote: > all that "asm/llsc.h" does is just to help inline asm, which can be > stringifyed from "asm/asm.h" > > +. Since "asm/asm.h" has all we need, retire "asm/llsc.h" > > +. remove unused header file > > Inspired-by: Maciej W. Rozycki <macro@xxxxxxxxxxx> > Signed-off-by: Huang Pei <huangpei@xxxxxxxxxxx> > --- > arch/mips/include/asm/asm.h | 4 +++ > arch/mips/include/asm/atomic.h | 10 +++----- > arch/mips/include/asm/bitops.h | 24 ++++++++---------- > arch/mips/include/asm/cmpxchg.h | 8 +++--- > arch/mips/include/asm/kvm_host.h | 12 ++++----- > arch/mips/include/asm/llsc.h | 43 -------------------------------- > 6 files changed, 28 insertions(+), 73 deletions(-) > delete mode 100644 arch/mips/include/asm/llsc.h > > diff --git a/arch/mips/include/asm/asm.h b/arch/mips/include/asm/asm.h > index f3302b13d3e0..ed74a6032ec8 100644 > --- a/arch/mips/include/asm/asm.h > +++ b/arch/mips/include/asm/asm.h > @@ -182,6 +182,8 @@ symbol = value > #define INT_SRLV srlv > #define INT_SRA sra > #define INT_SRAV srav > +#define LONG_INS ins > +#define LONG_EXT ext > #endif > > #if (_MIPS_SZINT == 64) > @@ -199,6 +201,8 @@ symbol = value > #define INT_SRLV dsrlv > #define INT_SRA dsra > #define INT_SRAV dsrav > +#define LONG_INS dins > +#define LONG_EXT dext > #endif this is the wrong place for the defines. I wonder how you compiled it as it blew up a loongson64 build. > diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h > index a0b9e7c1e4fc..77ba1e36701f 100644 > --- a/arch/mips/include/asm/atomic.h > +++ b/arch/mips/include/asm/atomic.h > @@ -20,9 +20,7 @@ > #include <asm/compiler.h> > #include <asm/cpu-features.h> > #include <asm/cmpxchg.h> > -#include <asm/llsc.h> > #include <asm/sync.h> > -#include <asm/war.h> I've added an #include <asm/asm.h> as this file is now using defines out of it. > diff --git a/arch/mips/include/asm/cmpxchg.h b/arch/mips/include/asm/cmpxchg.h > index 66a8b293fd80..b47a5e49f519 100644 > --- a/arch/mips/include/asm/cmpxchg.h > +++ b/arch/mips/include/asm/cmpxchg.h > @@ -11,9 +11,7 @@ > #include <linux/bug.h> > #include <linux/irqflags.h> > #include <asm/compiler.h> > -#include <asm/llsc.h> > #include <asm/sync.h> > -#include <asm/war.h> same here. This also caused compile errors... applied to mips-next with the compile fixes. Thomas. -- Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]
