Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262712AbUKLX62 (ORCPT ); Fri, 12 Nov 2004 18:58:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262739AbUKLX5H (ORCPT ); Fri, 12 Nov 2004 18:57:07 -0500 Received: from pool-151-203-245-3.bos.east.verizon.net ([151.203.245.3]:23556 "EHLO ccure.user-mode-linux.org") by vger.kernel.org with ESMTP id S262712AbUKLXrz (ORCPT ); Fri, 12 Nov 2004 18:47:55 -0500 Message-Id: <200411130201.iAD212pT005901@ccure.user-mode-linux.org> X-Mailer: exmh version 2.4 06/23/2000 with nmh-1.1-RC1 To: akpm@osdl.org, Blaisorblade cc: linux-kernel@vger.kernel.org Subject: [PATCH 11/11] - UML - fix definitions of pte_unmap_* Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 12 Nov 2004 21:01:02 -0500 From: Jeff Dike Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1405 Lines: 31 Some definitions of pte_unmap_* macros were written for HIGHPTE, which UML doesn't support. Signed-off-by: Jeff Dike Index: 2.6.9/include/asm-um/pgtable.h =================================================================== --- 2.6.9.orig/include/asm-um/pgtable.h 2004-11-12 13:26:04.000000000 -0500 +++ 2.6.9/include/asm-um/pgtable.h 2004-11-12 17:01:05.000000000 -0500 @@ -393,11 +393,10 @@ #define pte_offset_kernel(dir, address) \ ((pte_t *) pmd_page_kernel(*(dir)) + pte_index(address)) #define pte_offset_map(dir, address) \ - ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE0) + pte_index(address)) -#define pte_offset_map_nested(dir, address) \ - ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE1) + pte_index(address)) -#define pte_unmap(pte) kunmap_atomic((pte), KM_PTE0) -#define pte_unmap_nested(pte) kunmap_atomic((pte), KM_PTE1) + ((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address)) +#define pte_offset_map_nested(dir, address) pte_offset_map(dir, address) +#define pte_unmap(pte) do { } while (0) +#define pte_unmap_nested(pte) do { } while (0) #define update_mmu_cache(vma,address,pte) do ; while (0) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/