• Guenter Roeck's avatar
    MIPS: NL: Fix nlm_xlp_defconfig build error · bbbf6d87
    Guenter Roeck authored
    The nlm_xlp_defconfig build fails with
    
    ./arch/mips/include/asm/mach-netlogic/topology.h:15:0:
    			error: "topology_core_id" redefined [-Werror]
    In file included from include/linux/smp.h:59:0,
    	[ ...]
                     from arch/mips/mm/dma-default.c:12:
    ./arch/mips/include/asm/smp.h:41:0:
    			note: this is the location of the previous definition
    
    and similar errors.
    
    This is caused by commit bda4584c ("MIPS: Support CPU topology files
    in sysfs") which adds the defines to arch/mips/include/asm/smp.h.
    
    Remove the defines from arch/mips/include/asm/mach-netlogic/topology.h
    as no longer necessary.
    Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
    Cc: Huacai Chen <chenhc@lemote.com>
    Cc: Andreas Herrmann <andreas.herrmann@caviumnetworks.com>
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/7513/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
    bbbf6d87
topology.h 424 Bytes