Hi Andrew,
On 13/03/15 22:54, Andrew Bresticker wrote:
> From: Kevin Cernekee
>
> 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
> Signed-off-by: Kevin Cernekee
> Signed-off-by: Andrew Bresticker
> ---
> 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
I suppose some possible future clean ups would be to convert the
remaining ones to #include_next 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..000
> --- 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
> - */
> -#ifndef __ASM_MIPS_MACH_AR7_WAR_H
> -#define __ASM_MIPS_MACH_AR7_WAR_H
> -
> -#
