From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 03/10] xen: arm: Rename page table "hint" field to slightly more descriptive "contig" Date: Tue, 18 Jun 2013 14:26:50 +0100 Message-ID: <1371562017-5379-3-git-send-email-ian.campbell@citrix.com> References: <1371562002.22783.25.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1371562002.22783.25.camel@zakaz.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: julien.grall@citrix.com, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org Signed-off-by: Ian Campbell --- xen/arch/arm/mm.c | 2 +- xen/include/asm-arm/page.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index d1290cd..d57e44e 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -526,7 +526,7 @@ static void __init create_mappings(unsigned long virt, count = nr_mfns / LPAE_ENTRIES; p = xen_second + second_linear_offset(virt); pte = mfn_to_xen_entry(base_mfn); - pte.pt.hint = 1; /* These maps are in 16-entry contiguous chunks. */ + pte.pt.contig = 1; /* These maps are in 16-entry contiguous chunks. */ for ( i = 0; i < count; i++ ) { write_pte(p + i, pte); diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 6317090..e34a8d6 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -115,7 +115,7 @@ typedef struct { /* These seven bits are only used in Block entries and are ignored * in Table entries. */ - unsigned long hint:1; /* In a block of 16 contiguous entries */ + unsigned long contig:1; /* In a block of 16 contiguous entries */ unsigned long pxn:1; /* Privileged-XN */ unsigned long xn:1; /* eXecute-Never */ unsigned long avail:4; /* Ignored by hardware */ @@ -150,7 +150,7 @@ typedef struct { /* These seven bits are only used in Block entries and are ignored * in Table entries. */ - unsigned long hint:1; /* In a block of 16 contiguous entries */ + unsigned long contig:1; /* In a block of 16 contiguous entries */ unsigned long sbz2:1; unsigned long xn:1; /* eXecute-Never */ unsigned long avail:4; /* Ignored by hardware */ -- 1.7.2.5