From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Hansen Subject: [RFC][PATCH 15/35] s390: create ptemap.h Date: Fri, 01 May 2009 07:42:24 -0700 Message-ID: <20090501144224.28171FBC@kernel> References: <20090501144201.D31EF417@kernel> Return-path: Received: from e32.co.us.ibm.com ([32.97.110.150]:36844 "EHLO e32.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758854AbZEAOm1 (ORCPT ); Fri, 1 May 2009 10:42:27 -0400 In-Reply-To: <20090501144201.D31EF417@kernel> Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-arch@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dave Hansen Signed-off-by: Dave Hansen --- linux-2.6.git-dave/arch/s390/include/asm/pgtable.h | 6 ++---- linux-2.6.git-dave/arch/s390/include/asm/ptemap.h | 9 +++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff -puN arch/s390/include/asm/pgtable.h~s390-ptemaph arch/s390/include/asm/pgtable.h --- linux-2.6.git/arch/s390/include/asm/pgtable.h~s390-ptemaph 2009-04-30 15:11:01.000000000 -0700 +++ linux-2.6.git-dave/arch/s390/include/asm/pgtable.h 2009-04-30 15:11:01.000000000 -0700 @@ -1040,10 +1040,8 @@ static inline pmd_t *pmd_offset(pud_t *p /* Find an entry in the lowest level page table.. */ #define pte_offset(pmd, addr) ((pte_t *) pmd_deref(*(pmd)) + pte_index(addr)) #define pte_offset_kernel(pmd, address) pte_offset(pmd,address) -#define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address) -#define pte_offset_map_nested(pmd, address) pte_offset_kernel(pmd, address) -#define pte_unmap(pte) do { } while (0) -#define pte_unmap_nested(pte) do { } while (0) + +#include /* * 31 bit swap entry format: diff -puN arch/s390/include/asm/ptemap.h~s390-ptemaph arch/s390/include/asm/ptemap.h --- linux-2.6.git/arch/s390/include/asm/ptemap.h~s390-ptemaph 2009-04-30 15:11:01.000000000 -0700 +++ linux-2.6.git-dave/arch/s390/include/asm/ptemap.h 2009-04-30 15:11:01.000000000 -0700 @@ -0,0 +1,9 @@ +#ifndef _S390_ASM_PTEMAP_H +#define _S390_ASM_PTEMAP_H + +#define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address) +#define pte_offset_map_nested(pmd, address) pte_offset_kernel(pmd, address) +#define pte_unmap(pte) do { } while (0) +#define pte_unmap_nested(pte) do { } while (0) + +#endif /* _S390_ASM_PTEMAP_H */ _