From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761203Ab2KAKYk (ORCPT ); Thu, 1 Nov 2012 06:24:40 -0400 Received: from smtp-out-183.synserver.de ([212.40.185.183]:1113 "EHLO smtp-out-183.synserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760034Ab2KAKYH (ORCPT ); Thu, 1 Nov 2012 06:24:07 -0400 X-SynServer-TrustedSrc: 1 X-SynServer-AuthUser: lars@laprican.de X-SynServer-PPID: 27679 From: Lars-Peter Clausen 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 Subject: [PATCH 5/5] xtensa: Use generic asm/mmu.h for nommu Date: Thu, 1 Nov 2012 11:24:27 +0100 Message-Id: <1351765467-29244-5-git-send-email-lars@metafoo.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1351765467-29244-1-git-send-email-lars@metafoo.de> References: <1351765467-29244-1-git-send-email-lars@metafoo.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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