diff --git a/[refs] b/[refs]
index b730dae4e4b4..0a80a264301b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac12c0fc8c08a14bfa263c3a478ee82ad3e346d2
+refs/heads/master: 9a798c076fcc26f29bf9e9d350a17cdeff0a314f
diff --git a/trunk/include/asm-s390/cmb.h b/trunk/include/asm-s390/cmb.h
index dae1dd4fb937..2d09950a9c11 100644
--- a/trunk/include/asm-s390/cmb.h
+++ b/trunk/include/asm-s390/cmb.h
@@ -47,7 +47,7 @@ struct cmbdata {
 /* reset channel measurement block */
 #define BIODASDRESETCMB		_IO(DASD_IOCTL_LETTER,34)
 /* read channel measurement data */
-#define BIODASDREADCMB		_IOWR(DASD_IOCTL_LETTER,32,u64)
+#define BIODASDREADCMB		_IOWR(DASD_IOCTL_LETTER,32,__u64)
 /* read channel measurement data */
 #define BIODASDREADALLCMB	_IOWR(DASD_IOCTL_LETTER,33,struct cmbdata)