Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756227Ab0KLSA7 (ORCPT ); Fri, 12 Nov 2010 13:00:59 -0500 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:50888 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756026Ab0KLSA6 (ORCPT ); Fri, 12 Nov 2010 13:00:58 -0500 From: Catalin Marinas To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Will Deacon Subject: [PATCH v2 03/20] ARM: LPAE: use u32 instead of unsigned long for 32-bit ptes Date: Fri, 12 Nov 2010 18:00:23 +0000 Message-Id: <1289584840-18097-4-git-send-email-catalin.marinas@arm.com> X-Mailer: git-send-email 1.7.3.2.164.g6f10c In-Reply-To: <1289584840-18097-1-git-send-email-catalin.marinas@arm.com> References: <1289584840-18097-1-git-send-email-catalin.marinas@arm.com> X-OriginalArrivalTime: 12 Nov 2010 18:00:48.0891 (UTC) FILETIME=[8980BCB0:01CB8293] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2694 Lines: 82 From: Will Deacon When using 2-level paging, pte_t and pmd_t are typedefs for unsigned long but phys_addr_t is a typedef for u32. This patch uses u32 for the page table entry types when phys_addr_t is not 64-bit, allowing the same conversion specifier to be used for physical addresses and page table entries regardless of LPAE. Signed-off-by: Will Deacon Signed-off-by: Catalin Marinas --- arch/arm/include/asm/page-nommu.h | 8 ++++---- arch/arm/include/asm/pgtable-2level-types.h | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/include/asm/page-nommu.h b/arch/arm/include/asm/page-nommu.h index d1b162a..a20641a 100644 --- a/arch/arm/include/asm/page-nommu.h +++ b/arch/arm/include/asm/page-nommu.h @@ -29,10 +29,10 @@ /* * These are used to make use of C type-checking.. */ -typedef unsigned long pte_t; -typedef unsigned long pmd_t; -typedef unsigned long pgd_t[2]; -typedef unsigned long pgprot_t; +typedef u32 pte_t; +typedef u32 pmd_t; +typedef u32 pgd_t[2]; +typedef u32 pgprot_t; #define pte_val(x) (x) #define pmd_val(x) (x) diff --git a/arch/arm/include/asm/pgtable-2level-types.h b/arch/arm/include/asm/pgtable-2level-types.h index 30f6741..adc4928 100644 --- a/arch/arm/include/asm/pgtable-2level-types.h +++ b/arch/arm/include/asm/pgtable-2level-types.h @@ -21,16 +21,16 @@ #undef STRICT_MM_TYPECHECKS -typedef unsigned long pteval_t; +typedef u32 pteval_t; #ifdef STRICT_MM_TYPECHECKS /* * These are used to make use of C type-checking.. */ -typedef struct { unsigned long pte; } pte_t; -typedef struct { unsigned long pmd; } pmd_t; -typedef struct { unsigned long pgd[2]; } pgd_t; -typedef struct { unsigned long pgprot; } pgprot_t; +typedef struct { u32 pte; } pte_t; +typedef struct { u32 pmd; } pmd_t; +typedef struct { u32 pgd[2]; } pgd_t; +typedef struct { u32 pgprot; } pgprot_t; #define pte_val(x) ((x).pte) #define pmd_val(x) ((x).pmd) @@ -45,10 +45,10 @@ typedef struct { unsigned long pgprot; } pgprot_t; /* * .. while these make it easier on the compiler */ -typedef unsigned long pte_t; -typedef unsigned long pmd_t; -typedef unsigned long pgd_t[2]; -typedef unsigned long pgprot_t; +typedef u32 pte_t; +typedef u32 pmd_t; +typedef u32 pgd_t[2]; +typedef u32 pgprot_t; #define pte_val(x) (x) #define pmd_val(x) (x) -- 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/