From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 4/5] xen/arm: Cleanup use of __attribute__((packed)) Date: Wed, 12 Mar 2014 19:08:38 +0000 Message-ID: <1394651319-8893-5-git-send-email-andrew.cooper3@citrix.com> References: <1394651319-8893-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1394651319-8893-1-git-send-email-andrew.cooper3@citrix.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 Cc: Andrew Cooper , Stefano Stabellini , Ian Campbell , Tim Deegan List-Id: xen-devel@lists.xenproject.org And standardise on having the statement at the head of the struct/union rather than at the tail. This is all mechanical shuffling. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Stefano Stabellini CC: Tim Deegan --- xen/include/asm-arm/page.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index e00be9e..6fe7fc5 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -94,7 +94,7 @@ * bits that's not in use in a given node type can be used as * extra software-defined bits. */ -typedef struct { +typedef struct __packed { /* These are used in all kinds of entry. */ unsigned long valid:1; /* Valid mapping */ unsigned long table:1; /* == 1 in 4k map entries too */ @@ -126,11 +126,11 @@ typedef struct { unsigned long xnt:1; /* eXecute-Never */ unsigned long apt:2; /* Access Permissions */ unsigned long nst:1; /* Not-Secure */ -} __attribute__((__packed__)) lpae_pt_t; +} lpae_pt_t; /* The p2m tables have almost the same layout, but some of the permission * and cache-control bits are laid out differently (or missing) */ -typedef struct { +typedef struct __packed { /* These are used in all kinds of entry. */ unsigned long valid:1; /* Valid mapping */ unsigned long table:1; /* == 1 in 4k map entries too */ @@ -156,13 +156,13 @@ typedef struct { unsigned long type:4; /* Ignore by hardware. Used to store p2m types */ unsigned long sbz1:5; -} __attribute__((__packed__)) lpae_p2m_t; +} lpae_p2m_t; /* * Walk is the common bits of p2m and pt entries which are needed to * simply walk the table (e.g. for debug). */ -typedef struct { +typedef struct __packed { /* These are used in all kinds of entry. */ unsigned long valid:1; /* Valid mapping */ unsigned long table:1; /* == 1 in 4k map entries too */ @@ -173,7 +173,7 @@ typedef struct { unsigned long base:28; /* Base address of block or next table */ unsigned long pad1:24; -} __attribute__((__packed__)) lpae_walk_t; +} lpae_walk_t; typedef union { uint64_t bits; -- 1.7.10.4