From: Johannes Weiner <jw@emlix.com> Date: Wed, 4 Mar 2009 15:21:28 +0000 (+0100) Subject: xtensa: remove redefinition of XCHAL_MMU_ASID_BITS X-Git-Tag: firefly_0821_release~14796^2~21 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4f682fbb27deb308ca6a1e24ec9c2be41e6d1026;p=firefly-linux-kernel-4.4.55.git xtensa: remove redefinition of XCHAL_MMU_ASID_BITS This constant is defined in all core headers. Remove the redundant definition which might error out if other includes lead to inclusion of <variant/core.h>. Signed-off-by: Johannes Weiner <jw@emlix.com> Signed-off-by: Chris Zankel <chris@zankel.net> --- diff --git a/arch/xtensa/include/asm/mmu_context.h b/arch/xtensa/include/asm/mmu_context.h index c0fd8e5b4513..6b7c19c8f4ce 100644 --- a/arch/xtensa/include/asm/mmu_context.h +++ b/arch/xtensa/include/asm/mmu_context.h @@ -16,13 +16,13 @@ #include <linux/stringify.h> #include <linux/sched.h> +#include <variant/core.h> + #include <asm/pgtable.h> #include <asm/cacheflush.h> #include <asm/tlbflush.h> #include <asm-generic/mm_hooks.h> -#define XCHAL_MMU_ASID_BITS 8 - #if (XCHAL_HAVE_TLBS != 1) # error "Linux must have an MMU!" #endif