2.1.12 && AXP, Part 2

Matthew Jacob (mjacob@feral.com)
Fri, 22 Nov 96 20:24:03 PST

Two other patches, the latter just a nit, for AXP 2.1.12

David M-T? Are you still doing axp-diffs? And please don't tell me
"RedHat is the place to go".

--- linux/arch/alpha/kernel/bios32.c.save Sat Nov 23 03:38:10 1996
+++ linux/arch/alpha/kernel/bios32.c Sat Nov 23 03:47:13 1996
@@ -57,6 +57,8 @@
#include <asm/hwrpb.h>
#include <asm/io.h>
#include <asm/segment.h>
+#include <asm/uaccess.h>
+#include <asm/system.h>


#define KB 1024
@@ -1247,27 +1249,30 @@
unsigned char *buf)
{
unsigned char ubyte;
- unsigned short ushort;
- unsigned int uint;
+ unsigned short ushort, *usptr;
+ unsigned int uint, *uiptr;
long err = 0;

+ usptr = (unsigned short *) buf;
+ uiptr = (unsigned int *) buf;
+
switch (len) {
case 1:
- ubyte = get_user(buf);
+ get_user(ubyte, buf);
err = pcibios_write_config_byte(bus, dfn, off, ubyte);
if (err != PCIBIOS_SUCCESSFUL) {
err = -EFAULT;
}
break;
case 2:
- ushort = get_user((unsigned short *)buf);
+ get_user(ushort, usptr);
err = pcibios_write_config_word(bus, dfn, off, ushort);
if (err != PCIBIOS_SUCCESSFUL) {
err = -EFAULT;
}
break;
case 4:
- uint = get_user((unsigned int *)buf);
+ get_user(uint, uiptr);
err = pcibios_write_config_dword(bus, dfn, off, uint);
if (err != PCIBIOS_SUCCESSFUL) {
err = -EFAULT;
--- linux/fs/ufs/ufs_namei.c.save Sat Nov 23 03:19:43 1996
+++ linux/fs/ufs/ufs_namei.c Sat Nov 23 03:20:15 1996
@@ -130,7 +130,7 @@
}
if (dir->i_sb->u.ufs_sb.s_flags & UFS_DEBUG) {
printk("lfragno 0x%lx direct d 0x%x d_ino %u d_reclen %u d_namlen %u d_name `%s'\n",
- lfragno, (unsigned int)d, ufs_swab32(d->d_ino), ufs_swab16(d->d_reclen), ufs_swab16(d->d_namlen), d->d_name);
+ lfragno, (unsigned long)d, ufs_swab32(d->d_ino), ufs_swab16(d->d_reclen), ufs_swab16(d->d_namlen), d->d_name);
}
if ((ufs_swab16(d->d_namlen) == len) &&
/* XXX - don't use strncmp() - see ext2fs */

--
To unsubscribe: send e-mail to axp-list-request@redhat.com with
'unsubscribe' as the subject.  Do not send it to axp-list@redhat.com



Feedback | Store | News | Support | Product Errata | About Us | Linux Info | Search | JumpWords
No Frames | Show Frames

Copyright © 1995-1997 Red Hat Software. Legal notices