Hi Andrew, On 13/03/15 22:54, Andrew Bresticker wrote: > From: Kevin Cernekee <cernekee@xxxxxxxxx> > > 11 platforms require at least one of these workarounds to be enabled; 22 > platforms do not. In the latter case we can fall back to a generic version. > > Note that this also deletes an orphaned reference to RM9000_CDEX_SMP_WAR. > > Suggested-by: Arnd Bergmann <arnd@xxxxxxxx> > Signed-off-by: Kevin Cernekee <cernekee@xxxxxxxxx> > Signed-off-by: Andrew Bresticker <abrestic@xxxxxxxxxxxx> > --- > No changes from v1. > Changes from Kevin's v6: > - Left cavium-octeon's war.h in-tact Based on the content of mach-generic/war.h and the list of files in the diffstat with some grepping/hashing/diffing to verify correctness & completeness, this looks good to me. Reviewed-by: James Hogan <james.hogan@xxxxxxxxxx> I suppose some possible future clean ups would be to convert the remaining ones to #include_next <war.h> after defining only overrides (like irq.h does, assuming that's an idiom people are happy with), and for mach-generic/war.h to have #ifndef guards around each WAR definition. That way they could all share the common definitions, including cavium-octeon which only adds octeon specific ones rather than changing any of the ones defined in mach-generic/war.h. Cheers James > --- > arch/mips/include/asm/mach-ar7/war.h | 24 ------------------------ > arch/mips/include/asm/mach-ath25/war.h | 25 ------------------------- > arch/mips/include/asm/mach-ath79/war.h | 24 ------------------------ > arch/mips/include/asm/mach-au1x00/war.h | 24 ------------------------ > arch/mips/include/asm/mach-bcm3384/war.h | 24 ------------------------ > arch/mips/include/asm/mach-bcm47xx/war.h | 24 ------------------------ > arch/mips/include/asm/mach-bcm63xx/war.h | 24 ------------------------ > arch/mips/include/asm/mach-cobalt/war.h | 24 ------------------------ > arch/mips/include/asm/mach-dec/war.h | 24 ------------------------ > arch/mips/include/asm/mach-emma2rh/war.h | 24 ------------------------ > arch/mips/include/asm/mach-generic/war.h | 24 ++++++++++++++++++++++++ > arch/mips/include/asm/mach-jazz/war.h | 24 ------------------------ > arch/mips/include/asm/mach-jz4740/war.h | 24 ------------------------ > arch/mips/include/asm/mach-lantiq/war.h | 23 ----------------------- > arch/mips/include/asm/mach-lasat/war.h | 24 ------------------------ > arch/mips/include/asm/mach-loongson/war.h | 24 ------------------------ > arch/mips/include/asm/mach-loongson1/war.h | 24 ------------------------ > arch/mips/include/asm/mach-netlogic/war.h | 25 ------------------------- > arch/mips/include/asm/mach-paravirt/war.h | 25 ------------------------- > arch/mips/include/asm/mach-pnx833x/war.h | 24 ------------------------ > arch/mips/include/asm/mach-ralink/war.h | 24 ------------------------ > arch/mips/include/asm/mach-tx39xx/war.h | 24 ------------------------ > arch/mips/include/asm/mach-vr41xx/war.h | 24 ------------------------ > 23 files changed, 24 insertions(+), 530 deletions(-) > delete mode 100644 arch/mips/include/asm/mach-ar7/war.h > delete mode 100644 arch/mips/include/asm/mach-ath25/war.h > delete mode 100644 arch/mips/include/asm/mach-ath79/war.h > delete mode 100644 arch/mips/include/asm/mach-au1x00/war.h > delete mode 100644 arch/mips/include/asm/mach-bcm3384/war.h > delete mode 100644 arch/mips/include/asm/mach-bcm47xx/war.h > delete mode 100644 arch/mips/include/asm/mach-bcm63xx/war.h > delete mode 100644 arch/mips/include/asm/mach-cobalt/war.h > delete mode 100644 arch/mips/include/asm/mach-dec/war.h > delete mode 100644 arch/mips/include/asm/mach-emma2rh/war.h > create mode 100644 arch/mips/include/asm/mach-generic/war.h > delete mode 100644 arch/mips/include/asm/mach-jazz/war.h > delete mode 100644 arch/mips/include/asm/mach-jz4740/war.h > delete mode 100644 arch/mips/include/asm/mach-lantiq/war.h > delete mode 100644 arch/mips/include/asm/mach-lasat/war.h > delete mode 100644 arch/mips/include/asm/mach-loongson/war.h > delete mode 100644 arch/mips/include/asm/mach-loongson1/war.h > delete mode 100644 arch/mips/include/asm/mach-netlogic/war.h > delete mode 100644 arch/mips/include/asm/mach-paravirt/war.h > delete mode 100644 arch/mips/include/asm/mach-pnx833x/war.h > delete mode 100644 arch/mips/include/asm/mach-ralink/war.h > delete mode 100644 arch/mips/include/asm/mach-tx39xx/war.h > delete mode 100644 arch/mips/include/asm/mach-vr41xx/war.h > > diff --git a/arch/mips/include/asm/mach-ar7/war.h b/arch/mips/include/asm/mach-ar7/war.h > deleted file mode 100644 > index 99071e5..0000000 > --- a/arch/mips/include/asm/mach-ar7/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MIPS_MACH_AR7_WAR_H > -#define __ASM_MIPS_MACH_AR7_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MIPS_MACH_AR7_WAR_H */ > diff --git a/arch/mips/include/asm/mach-ath25/war.h b/arch/mips/include/asm/mach-ath25/war.h > deleted file mode 100644 > index e3a5250..0000000 > --- a/arch/mips/include/asm/mach-ath25/war.h > +++ /dev/null > @@ -1,25 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2008 Felix Fietkau <nbd@xxxxxxxxxxx> > - */ > -#ifndef __ASM_MACH_ATH25_WAR_H > -#define __ASM_MACH_ATH25_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define RM9000_CDEX_SMP_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MACH_ATH25_WAR_H */ > diff --git a/arch/mips/include/asm/mach-ath79/war.h b/arch/mips/include/asm/mach-ath79/war.h > deleted file mode 100644 > index 0bb3090..0000000 > --- a/arch/mips/include/asm/mach-ath79/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MACH_ATH79_WAR_H > -#define __ASM_MACH_ATH79_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MACH_ATH79_WAR_H */ > diff --git a/arch/mips/include/asm/mach-au1x00/war.h b/arch/mips/include/asm/mach-au1x00/war.h > deleted file mode 100644 > index 72e260d..0000000 > --- a/arch/mips/include/asm/mach-au1x00/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MIPS_MACH_AU1X00_WAR_H > -#define __ASM_MIPS_MACH_AU1X00_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MIPS_MACH_AU1X00_WAR_H */ > diff --git a/arch/mips/include/asm/mach-bcm3384/war.h b/arch/mips/include/asm/mach-bcm3384/war.h > deleted file mode 100644 > index 59d7599..0000000 > --- a/arch/mips/include/asm/mach-bcm3384/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MIPS_MACH_BCM3384_WAR_H > -#define __ASM_MIPS_MACH_BCM3384_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MIPS_MACH_BCM3384_WAR_H */ > diff --git a/arch/mips/include/asm/mach-bcm47xx/war.h b/arch/mips/include/asm/mach-bcm47xx/war.h > deleted file mode 100644 > index a3d2f44..0000000 > --- a/arch/mips/include/asm/mach-bcm47xx/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MIPS_MACH_BCM47XX_WAR_H > -#define __ASM_MIPS_MACH_BCM47XX_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MIPS_MACH_BCM47XX_WAR_H */ > diff --git a/arch/mips/include/asm/mach-bcm63xx/war.h b/arch/mips/include/asm/mach-bcm63xx/war.h > deleted file mode 100644 > index 05ee867..0000000 > --- a/arch/mips/include/asm/mach-bcm63xx/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MIPS_MACH_BCM63XX_WAR_H > -#define __ASM_MIPS_MACH_BCM63XX_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MIPS_MACH_BCM63XX_WAR_H */ > diff --git a/arch/mips/include/asm/mach-cobalt/war.h b/arch/mips/include/asm/mach-cobalt/war.h > deleted file mode 100644 > index 34ae404..0000000 > --- a/arch/mips/include/asm/mach-cobalt/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MIPS_MACH_COBALT_WAR_H > -#define __ASM_MIPS_MACH_COBALT_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MIPS_MACH_COBALT_WAR_H */ > diff --git a/arch/mips/include/asm/mach-dec/war.h b/arch/mips/include/asm/mach-dec/war.h > deleted file mode 100644 > index d29996f..0000000 > --- a/arch/mips/include/asm/mach-dec/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MIPS_MACH_DEC_WAR_H > -#define __ASM_MIPS_MACH_DEC_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MIPS_MACH_DEC_WAR_H */ > diff --git a/arch/mips/include/asm/mach-emma2rh/war.h b/arch/mips/include/asm/mach-emma2rh/war.h > deleted file mode 100644 > index 79ae82d..0000000 > --- a/arch/mips/include/asm/mach-emma2rh/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MIPS_MACH_EMMA2RH_WAR_H > -#define __ASM_MIPS_MACH_EMMA2RH_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MIPS_MACH_EMMA2RH_WAR_H */ > diff --git a/arch/mips/include/asm/mach-generic/war.h b/arch/mips/include/asm/mach-generic/war.h > new file mode 100644 > index 0000000..a1bc2e7 > --- /dev/null > +++ b/arch/mips/include/asm/mach-generic/war.h > @@ -0,0 +1,24 @@ > +/* > + * This file is subject to the terms and conditions of the GNU General Public > + * License. See the file "COPYING" in the main directory of this archive > + * for more details. > + * > + * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > + */ > +#ifndef __ASM_MACH_GENERIC_WAR_H > +#define __ASM_MACH_GENERIC_WAR_H > + > +#define R4600_V1_INDEX_ICACHEOP_WAR 0 > +#define R4600_V1_HIT_CACHEOP_WAR 0 > +#define R4600_V2_HIT_CACHEOP_WAR 0 > +#define R5432_CP0_INTERRUPT_WAR 0 > +#define BCM1250_M3_WAR 0 > +#define SIBYTE_1956_WAR 0 > +#define MIPS4K_ICACHE_REFILL_WAR 0 > +#define MIPS_CACHE_SYNC_WAR 0 > +#define TX49XX_ICACHE_INDEX_INV_WAR 0 > +#define ICACHE_REFILLS_WORKAROUND_WAR 0 > +#define R10000_LLSC_WAR 0 > +#define MIPS34K_MISSED_ITLB_WAR 0 > + > +#endif /* __ASM_MACH_GENERIC_WAR_H */ > diff --git a/arch/mips/include/asm/mach-jazz/war.h b/arch/mips/include/asm/mach-jazz/war.h > deleted file mode 100644 > index 5b18b9a..0000000 > --- a/arch/mips/include/asm/mach-jazz/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MIPS_MACH_JAZZ_WAR_H > -#define __ASM_MIPS_MACH_JAZZ_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MIPS_MACH_JAZZ_WAR_H */ > diff --git a/arch/mips/include/asm/mach-jz4740/war.h b/arch/mips/include/asm/mach-jz4740/war.h > deleted file mode 100644 > index 9b511d3..0000000 > --- a/arch/mips/include/asm/mach-jz4740/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MIPS_MACH_JZ4740_WAR_H > -#define __ASM_MIPS_MACH_JZ4740_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MIPS_MACH_JZ4740_WAR_H */ > diff --git a/arch/mips/include/asm/mach-lantiq/war.h b/arch/mips/include/asm/mach-lantiq/war.h > deleted file mode 100644 > index 358ca97..0000000 > --- a/arch/mips/include/asm/mach-lantiq/war.h > +++ /dev/null > @@ -1,23 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - */ > -#ifndef __ASM_MIPS_MACH_LANTIQ_WAR_H > -#define __ASM_MIPS_MACH_LANTIQ_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif > diff --git a/arch/mips/include/asm/mach-lasat/war.h b/arch/mips/include/asm/mach-lasat/war.h > deleted file mode 100644 > index 741ae72..0000000 > --- a/arch/mips/include/asm/mach-lasat/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MIPS_MACH_LASAT_WAR_H > -#define __ASM_MIPS_MACH_LASAT_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MIPS_MACH_LASAT_WAR_H */ > diff --git a/arch/mips/include/asm/mach-loongson/war.h b/arch/mips/include/asm/mach-loongson/war.h > deleted file mode 100644 > index f2570df..0000000 > --- a/arch/mips/include/asm/mach-loongson/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MACH_LOONGSON_WAR_H > -#define __ASM_MACH_LOONGSON_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MACH_LEMOTE_WAR_H */ > diff --git a/arch/mips/include/asm/mach-loongson1/war.h b/arch/mips/include/asm/mach-loongson1/war.h > deleted file mode 100644 > index 8fb50d0..0000000 > --- a/arch/mips/include/asm/mach-loongson1/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MACH_LOONGSON1_WAR_H > -#define __ASM_MACH_LOONGSON1_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MACH_LOONGSON1_WAR_H */ > diff --git a/arch/mips/include/asm/mach-netlogic/war.h b/arch/mips/include/asm/mach-netlogic/war.h > deleted file mode 100644 > index 2c72168..0000000 > --- a/arch/mips/include/asm/mach-netlogic/war.h > +++ /dev/null > @@ -1,25 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2011 Netlogic Microsystems. > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MIPS_MACH_NLM_WAR_H > -#define __ASM_MIPS_MACH_NLM_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MIPS_MACH_NLM_WAR_H */ > diff --git a/arch/mips/include/asm/mach-paravirt/war.h b/arch/mips/include/asm/mach-paravirt/war.h > deleted file mode 100644 > index 36d3afb..0000000 > --- a/arch/mips/include/asm/mach-paravirt/war.h > +++ /dev/null > @@ -1,25 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - * Copyright (C) 2013 Cavium Networks <support@xxxxxxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MIPS_MACH_PARAVIRT_WAR_H > -#define __ASM_MIPS_MACH_PARAVIRT_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MIPS_MACH_PARAVIRT_WAR_H */ > diff --git a/arch/mips/include/asm/mach-pnx833x/war.h b/arch/mips/include/asm/mach-pnx833x/war.h > deleted file mode 100644 > index e410df4..0000000 > --- a/arch/mips/include/asm/mach-pnx833x/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MIPS_MACH_PNX833X_WAR_H > -#define __ASM_MIPS_MACH_PNX833X_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MIPS_MACH_PNX833X_WAR_H */ > diff --git a/arch/mips/include/asm/mach-ralink/war.h b/arch/mips/include/asm/mach-ralink/war.h > deleted file mode 100644 > index c074b5d..0000000 > --- a/arch/mips/include/asm/mach-ralink/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MACH_RALINK_WAR_H > -#define __ASM_MACH_RALINK_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MACH_RALINK_WAR_H */ > diff --git a/arch/mips/include/asm/mach-tx39xx/war.h b/arch/mips/include/asm/mach-tx39xx/war.h > deleted file mode 100644 > index 6a52e65..0000000 > --- a/arch/mips/include/asm/mach-tx39xx/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MIPS_MACH_TX39XX_WAR_H > -#define __ASM_MIPS_MACH_TX39XX_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MIPS_MACH_TX39XX_WAR_H */ > diff --git a/arch/mips/include/asm/mach-vr41xx/war.h b/arch/mips/include/asm/mach-vr41xx/war.h > deleted file mode 100644 > index ffe31e7..0000000 > --- a/arch/mips/include/asm/mach-vr41xx/war.h > +++ /dev/null > @@ -1,24 +0,0 @@ > -/* > - * This file is subject to the terms and conditions of the GNU General Public > - * License. See the file "COPYING" in the main directory of this archive > - * for more details. > - * > - * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@xxxxxxxxxxxxxx> > - */ > -#ifndef __ASM_MIPS_MACH_VR41XX_WAR_H > -#define __ASM_MIPS_MACH_VR41XX_WAR_H > - > -#define R4600_V1_INDEX_ICACHEOP_WAR 0 > -#define R4600_V1_HIT_CACHEOP_WAR 0 > -#define R4600_V2_HIT_CACHEOP_WAR 0 > -#define R5432_CP0_INTERRUPT_WAR 0 > -#define BCM1250_M3_WAR 0 > -#define SIBYTE_1956_WAR 0 > -#define MIPS4K_ICACHE_REFILL_WAR 0 > -#define MIPS_CACHE_SYNC_WAR 0 > -#define TX49XX_ICACHE_INDEX_INV_WAR 0 > -#define ICACHE_REFILLS_WORKAROUND_WAR 0 > -#define R10000_LLSC_WAR 0 > -#define MIPS34K_MISSED_ITLB_WAR 0 > - > -#endif /* __ASM_MIPS_MACH_VR41XX_WAR_H */ >
Attachment:
signature.asc
Description: OpenPGP digital signature
