The MI/MD split wasn't perfect and the MI files need hacks for the

AlphaLinux compat bits.  This will be better cleaned up soon.

Agreed to what ever was necessary by:	marcel

1 files changed, 18 insertions, 1 deletions

diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index e41d2ff..3efd91a 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -51,8 +51,18 @@
 #include <sys/disklabel.h>
 
 #include <machine/../linux/linux.h>
+#ifdef __alpha__
+#include <linux_proto.h>
+#else
 #include <machine/../linux/linux_proto.h>
+#endif
+
+#include <linux_proto.h>
+#ifdef __alpha__
+#include <machine/../linux/linux_ioctl.h>
+#else
 #include <compat/linux/linux_ioctl.h>
+#endif
 #include <compat/linux/linux_mib.h>
 #include <compat/linux/linux_util.h>
 
@@ -120,8 +130,15 @@ struct linux_termio {
 	unsigned short c_oflag;
 	unsigned short c_cflag;
 	unsigned short c_lflag;
+#ifdef __alpha__
+	unsigned char c_cc[LINUX_NCCS];
+	unsigned char c_line;
+	unsigned int  c_ispeed;
+	unsigned int  c_ospeed;
+#else
 	unsigned char c_line;
 	unsigned char c_cc[LINUX_NCC];
+#endif
 };
 
 struct linux_termios {
@@ -966,7 +983,7 @@ linux_ioctl_cdrom(struct proc *p, struct linux_ioctl_args *args)
  * Sound related ioctls
  */
 
-static unsigned dirbits[4] = { IOC_VOID, IOC_IN, IOC_OUT, IOC_INOUT };
+static u_int32_t dirbits[4] = { IOC_VOID, IOC_IN, IOC_OUT, IOC_INOUT };
 
 #define	SETDIR(c)	(((c) & ~IOC_DIRMASK) | dirbits[args->cmd >> 30])