2009-03-02 16:58:00

by Johannes Weiner

[permalink] [raw]
Subject: [patch 2/7] 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 <[email protected]>
---
arch/xtensa/include/asm/mmu_context.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- 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

--