[Oracleasm-commits] jlbec commits r331 - trunk/kernel

[svn-commits@oss.oracle.com]

Author: jlbec
Date: 2006-02-21 20:44:35 -0600 (Tue, 21 Feb 2006)
New Revision: 331

Modified:
   trunk/kernel/oracleasm.c
Log:

o And, clean up mlog formats for ppc64/etc.



Modified: trunk/kernel/oracleasm.c
===================================================================
--- trunk/kernel/oracleasm.c	2006-02-22 02:39:29 UTC (rev 330)
+++ trunk/kernel/oracleasm.c	2006-02-22 02:44:35 UTC (rev 331)
@@ -1701,7 +1701,7 @@
 	     ioc_32->buffer_asm_ioc);
 	ioc->check_asm_ioc = (u64)ioc_32->check_asm_ioc;
 	ioc->buffer_asm_ioc = (u64)ioc_32->buffer_asm_ioc;
-	mlog(ML_IOC, "Promoted to (0x%llX, 0x%llX)\n",
+	mlog(ML_IOC, "Promoted to (0x%"MLFu64", 0x%"MLFu64")\n",
 	     ioc->check_asm_ioc,
 	     ioc->buffer_asm_ioc);
 
@@ -2097,7 +2097,7 @@
 	struct oracleasm_abi_info *abi_info;
 	int ret;
 
-	mlog_entry("(0x%p, 0x%p, %u)\n", file, buf, size);
+	mlog_entry("(0x%p, 0x%p, %u)\n", file, buf, (unsigned int)size);
 
 	if (size != sizeof(struct oracleasm_abi_info))
 		return -EINVAL;
@@ -2136,7 +2136,7 @@
 	struct asmfs_sb_info *asb = ASMFS_SB(ASMFS_F2I(file)->i_sb);
 	int ret;
 
-	mlog_entry("(0x%p, 0x%p, %u)\n", file, buf, size);
+	mlog_entry("(0x%p, 0x%p, %u)\n", file, buf, (unsigned int)size);
 
 	if (size != sizeof(struct oracleasm_get_iid_v2))
 		return -EINVAL;
@@ -2174,7 +2174,7 @@
 	struct asmfs_sb_info *asb = ASMFS_SB(ASMFS_F2I(file)->i_sb);
 	int ret;
 
-	mlog_entry("(0x%p, 0x%p, %u)\n", file, buf, size);
+	mlog_entry("(0x%p, 0x%p, %u)\n", file, buf, (unsigned int)size);
 
 	if (size != sizeof(struct oracleasm_get_iid_v2))
 		return -EINVAL;
@@ -2214,7 +2214,7 @@
 	struct block_device *bdev;
 	int ret;
 
-	mlog_entry("(0x%p, 0x%p, %u)\n", file, buf, size);
+	mlog_entry("(0x%p, 0x%p, %u)\n", file, buf, (unsigned int)size);
 
 	if (size != sizeof(struct oracleasm_query_disk_v2))
 		return -EINVAL;
@@ -2266,7 +2266,7 @@
 	struct file *filp;
 	int ret;
 
-	mlog_entry("(0x%p, 0x%p, %u)\n", file, buf, size);
+	mlog_entry("(0x%p, 0x%p, %u)\n", file, buf, (unsigned int)size);
 
 	if (size != sizeof(struct oracleasm_open_disk_v2))
 		return -EINVAL;
@@ -2329,7 +2329,7 @@
 	struct oracleasm_close_disk_v2 cd_info;
 	int ret;
 
-	mlog_entry("(0x%p, 0x%p, %u)\n", file, buf, size);
+	mlog_entry("(0x%p, 0x%p, %u)\n", file, buf, (unsigned int)size);
 
 	if (size != sizeof(struct oracleasm_close_disk_v2))
 		return -EINVAL;
@@ -2370,7 +2370,7 @@
 	struct oracleasm_io_v2 io_info;
 	int ret;
 
-	mlog_entry("(0x%p, 0x%p, %u)\n", file, buf, size);
+	mlog_entry("(0x%p, 0x%p, %u)\n", file, buf, (unsigned int)size);
 
 	if (size != sizeof(struct oracleasm_io_v2))
 		return -EINVAL;
@@ -2410,7 +2410,7 @@
 	struct oracleasm_io_v2 io_info;
 	int ret;
 
-	mlog_entry("(0x%p, 0x%p, %u)\n", file, buf, size);
+	mlog_entry("(0x%p, 0x%p, %u)\n", file, buf, (unsigned int)size);
 
 	if (size != sizeof(struct oracleasm_io_v2))
 		return -EINVAL;