Re: milstone reached: ia64 linux builds out of Linus' tree

From: Andreas Schwab (schwab@suse.de)
Date: Mon Aug 04 2003 - 14:18:57 EST

jbarnes@sgi.com (Jesse Barnes) writes:

|> diff -Nru a/fs/xfs/linux/xfs_vfs.h b/fs/xfs/linux/xfs_vfs.h
|> --- a/fs/xfs/linux/xfs_vfs.h Wed Jul 16 12:10:39 2003
|> +++ b/fs/xfs/linux/xfs_vfs.h Wed Jul 16 12:10:39 2003
|> @@ -44,8 +44,8 @@
|>
|> typedef struct vfs {
|> u_int vfs_flag; /* flags */
|> - fsid_t vfs_fsid; /* file system ID */
|> - fsid_t *vfs_altfsid; /* An ID fixed for life of FS */
|> + __kernel_fsid_t vfs_fsid; /* file system ID */
|> + __kernel_fsid_t *vfs_altfsid; /* An ID fixed for life of FS */
|> bhv_head_t vfs_bh; /* head of vfs behavior chain */
|> struct super_block *vfs_super; /* Linux superblock structure */
|> struct task_struct *vfs_sync_task;

Alternatively you could use this patch (following the other
architectures):

--- linux-2.5.73/include/asm-ia64/statfs.h.~1~ 2003-06-22 20:32:55.000000000 +0200
+++ linux-2.5.73/include/asm-ia64/statfs.h 2003-07-01 16:14:44.000000000 +0200
@@ -6,6 +6,11 @@
  * Copyright (C) 1998, 1999 David Mosberger-Tang <davidm@hpl.hp.com>
  */
 
+#ifndef __KERNEL_STRICT_NAMES
+# include <linux/types.h>
+typedef __kernel_fsid_t fsid_t;
+#endif
+
 /*
  * This is ugly --- we're already 64-bit, so just duplicate the definitions
  */

Andreas. 

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Deutschherrnstr. 15-19, D-90429 Nürnberg
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Thu Aug 07 2003 - 22:00:24 EST