From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lars-Peter Clausen Subject: [PATCH resend 5/5] xtensa: Use generic asm/mmu.h for nommu Date: Sat, 1 Dec 2012 14:24:44 +0100 Message-ID: <1354368284-11625-5-git-send-email-lars@metafoo.de> References: <1354368284-11625-1-git-send-email-lars@metafoo.de> Return-path: Received: from smtp-out-239.synserver.de ([212.40.185.239]:1213 "EHLO smtp-out-239.synserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751427Ab2LANYR (ORCPT ); Sat, 1 Dec 2012 08:24:17 -0500 In-Reply-To: <1354368284-11625-1-git-send-email-lars@metafoo.de> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Arnd Bergmann Cc: Mark Salter , Aurelien Jacquiot , Yoshinori Sato , Chris Zankel , Max Filippov , linux-c6x-dev@linux-c6x.org, linux-kernel@vger.kernel.org, linux-xtensa@linux-xtensa.org, linux-arch@vger.kernel.org, Lars-Peter Clausen The nommu portion of mmu.h of the extensa platform is basically the same as the asm-generic mmu.h. So use it instead. Signed-off-by: Lars-Peter Clausen --- Note, due to lack of toolchain, etc this patch is completely untested. --- arch/xtensa/include/asm/mmu.h | 2 +- arch/xtensa/include/asm/nommu.h | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) delete mode 100644 arch/xtensa/include/asm/nommu.h diff --git a/arch/xtensa/include/asm/mmu.h b/arch/xtensa/include/asm/mmu.h index 04890d6..8554b2c 100644 --- a/arch/xtensa/include/asm/mmu.h +++ b/arch/xtensa/include/asm/mmu.h @@ -12,7 +12,7 @@ #define _XTENSA_MMU_H #ifndef CONFIG_MMU -#include +#include #else /* Default "unsigned long" context */ diff --git a/arch/xtensa/include/asm/nommu.h b/arch/xtensa/include/asm/nommu.h deleted file mode 100644 index dce2c43..0000000 --- a/arch/xtensa/include/asm/nommu.h +++ /dev/null @@ -1,3 +0,0 @@ -typedef struct { - unsigned long end_brk; -} mm_context_t; -- 1.7.2.5