From 5771316eda72cd12898b670c1101807ad57bc155 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 4 May 2006 01:18:33 +0100
Subject: [PATCH] --- yaml --- r: 27994 b: refs/heads/master c:
 56b192c337ddad05dee83c9bea079f41df775990 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/include/asm-s390/vtoc.h | 38 +++++++++++++++++------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 0a80a264301b..752b60d18016 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a798c076fcc26f29bf9e9d350a17cdeff0a314f
+refs/heads/master: 56b192c337ddad05dee83c9bea079f41df775990
diff --git a/trunk/include/asm-s390/vtoc.h b/trunk/include/asm-s390/vtoc.h
index d1de5b7ebb0b..3a5267d90d29 100644
--- a/trunk/include/asm-s390/vtoc.h
+++ b/trunk/include/asm-s390/vtoc.h
@@ -177,27 +177,27 @@ struct vtoc_format7_label
 } __attribute__ ((packed));
 
 struct vtoc_cms_label {
-	u8 label_id[4];		/* Label identifier */
-	u8 vol_id[6];		/* Volid */
-	u16 version_id;		/* Version identifier */
-	u32 block_size;		/* Disk block size */
-	u32 origin_ptr;		/* Disk origin pointer */
-	u32 usable_count;	/* Number of usable cylinders/blocks */
-	u32 formatted_count;	/* Maximum number of formatted cylinders/
+	__u8 label_id[4];		/* Label identifier */
+	__u8 vol_id[6];		/* Volid */
+	__u16 version_id;		/* Version identifier */
+	__u32 block_size;		/* Disk block size */
+	__u32 origin_ptr;		/* Disk origin pointer */
+	__u32 usable_count;	/* Number of usable cylinders/blocks */
+	__u32 formatted_count;	/* Maximum number of formatted cylinders/
 				 * blocks */
-	u32 block_count;	/* Disk size in CMS blocks */
-	u32 used_count;		/* Number of CMS blocks in use */
-	u32 fst_size;		/* File Status Table (FST) size */
-	u32 fst_count;		/* Number of FSTs per CMS block */
-	u8 format_date[6];	/* Disk FORMAT date */
-	u8 reserved1[2];
-	u32 disk_offset;	/* Disk offset when reserved*/
-	u32 map_block;		/* Allocation Map Block with next hole */
-	u32 hblk_disp;		/* Displacement into HBLK data of next hole */
-	u32 user_disp;		/* Displacement into user part of Allocation
+	__u32 block_count;	/* Disk size in CMS blocks */
+	__u32 used_count;		/* Number of CMS blocks in use */
+	__u32 fst_size;		/* File Status Table (FST) size */
+	__u32 fst_count;		/* Number of FSTs per CMS block */
+	__u8 format_date[6];	/* Disk FORMAT date */
+	__u8 reserved1[2];
+	__u32 disk_offset;	/* Disk offset when reserved*/
+	__u32 map_block;		/* Allocation Map Block with next hole */
+	__u32 hblk_disp;		/* Displacement into HBLK data of next hole */
+	__u32 user_disp;		/* Displacement into user part of Allocation
 				 * map */
-	u8 reserved2[4];
-	u8 segment_name[8];	/* Name of shared segment */
+	__u8 reserved2[4];
+	__u8 segment_name[8];	/* Name of shared segment */
 } __attribute__ ((packed));
 
 #endif /* _ASM_S390_VTOC_H */