summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Owens <kaos@sgi.com>2003-02-19 20:21:39 +0100
committerChristoph Hellwig <hch@lab343.munich.sgi.com>2003-02-19 20:21:39 +0100
commit61bcd68ee9054872612b202804fe6169c7315867 (patch)
tree0cb3a56afb2d92b2ba40deb048624bd88e6f34ad
parent955bf21e652b4b3e49d85a54cc4d1287594ef3da (diff)
[XFS] XFS patches from 2.5.60-mm1
SGI Modid: 2.5.x-xfs:slinx:139330a
-rw-r--r--fs/xfs/support/debug.c2
-rw-r--r--fs/xfs/xfs_error.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c
index cbedf29d7586..524238f6f922 100644
--- a/fs/xfs/support/debug.c
+++ b/fs/xfs/support/debug.c
@@ -86,7 +86,7 @@ cmn_err(register int level, char *fmt, ...)
{
char *fp = fmt;
int len;
- int flags;
+ unsigned long flags;
va_list ap;
level &= XFS_ERR_MASK;
diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h
index f6c313627e1a..b59b84fa6bb4 100644
--- a/fs/xfs/xfs_error.h
+++ b/fs/xfs/xfs_error.h
@@ -33,7 +33,7 @@
#define __XFS_ERROR_H__
#define prdev(fmt,dev,args...) \
- printk("XFS: device 0x%x- " fmt "\n", dev, ## args)
+ printk("XFS: device 0x%x- " fmt "\n", (unsigned)dev, ## args)
#define XFS_ERECOVER 1 /* Failure to recover log */
#define XFS_ELOGSTAT 2 /* Failure to stat log in user space */