[Oracleasm-commits] jlbec commits r360 - branches/oracleasm-1.0/kernel
svn-commits@oss.oracle.com
svn-commits at oss.oracle.com
Fri Jul 28 19:37:48 CDT 2006
Author: jlbec
Date: 2006-07-28 19:37:47 -0500 (Fri, 28 Jul 2006)
New Revision: 360
Modified:
branches/oracleasm-1.0/kernel/masklog.c
branches/oracleasm-1.0/kernel/oracleasm.c
Log:
Fix a couple printk()s and an mlog_exit()->mlog_exit_void() for 64bit
compiles.
Add a find_first_bit() define for ia64.
Modified: branches/oracleasm-1.0/kernel/masklog.c
===================================================================
--- branches/oracleasm-1.0/kernel/masklog.c 2006-07-28 23:59:48 UTC (rev 359)
+++ branches/oracleasm-1.0/kernel/masklog.c 2006-07-29 00:37:47 UTC (rev 360)
@@ -28,6 +28,10 @@
#include "masklog.h"
+#ifndef find_first_bit
+#define find_first_bit(addr, size) find_next_bit((addr), (size), 0)
+#endif /* find_first_bit */
+
struct mlog_bits mlog_and_bits = MLOG_BITS_RHS(MLOG_INITIAL_AND_MASK);
struct mlog_bits mlog_not_bits = MLOG_BITS_RHS(MLOG_INITIAL_NOT_MASK);
Modified: branches/oracleasm-1.0/kernel/oracleasm.c
===================================================================
--- branches/oracleasm-1.0/kernel/oracleasm.c 2006-07-28 23:59:48 UTC (rev 359)
+++ branches/oracleasm-1.0/kernel/oracleasm.c 2006-07-29 00:37:47 UTC (rev 360)
@@ -1051,7 +1051,7 @@
struct asm_request *r = _req;
ssize_t err = 0;
- mlog_entry("(0x%p, 0x%p, %d)\n", _req, vec, (int)res);
+ mlog_entry("(0x%p, 0x%p, %lld)\n", _req, vec, (long long)res);
mlog_bug_on_msg(!r, "kvec 0x%p has no request\n", vec);
@@ -1059,8 +1059,8 @@
"Request 0x%p was not submitted\n", r);
mlog(ML_REQUEST,
- "Releasing kvec for request at 0x%p, res = %d\n",
- r, (int)res);
+ "Releasing kvec for request at 0x%p, res = %lld\n",
+ r, (long long)res);
if (res < 0) {
err = res;
@@ -1091,8 +1091,8 @@
switch (err) {
default:
mlog(ML_REQUEST|ML_ERROR,
- "Invalid error of %d on request 0x%p!\n",
- err, r);
+ "Invalid error of %lld on request 0x%p!\n",
+ (long long)err, r);
r->r_error = ASM_ERR_INVAL;
break;
@@ -1828,7 +1828,7 @@
ioc->check_asm_ioc,
ioc->buffer_asm_ioc);
- mlog_exit();
+ mlog_exit_void();
} /* asm_promote_64() */
More information about the Oracleasm-commits
mailing list