diff options
| author |   deraadt <deraadt@openbsd.org> | 2007-06-16 00:26:33 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2007-06-16 00:26:33 +0000 |
| commit | 5d0b23c6e9a5b9f52803fffdca3c4dc92225e04a (patch) | |
| tree | 03cb81ba734ffb04b15a81c0dcf4e961e22ba158 | |
| parent | disable softraid (because sr_boot_assembly->readdisklabel->readdoslabel->biowait) (diff) | |
| download | wireguard-openbsd-5d0b23c6e9a5b9f52803fffdca3c4dc92225e04a.tar.xz wireguard-openbsd-5d0b23c6e9a5b9f52803fffdca3c4dc92225e04a.zip | |
When EOVERFLOW was added, it broke the zaurus bootblocks
| -rw-r--r-- | sys/arch/zaurus/stand/zboot/compat_linux.h | 4 | ||||
| -rw-r--r-- | sys/arch/zaurus/stand/zboot/unixdev.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/zaurus/stand/zboot/compat_linux.h b/sys/arch/zaurus/stand/zboot/compat_linux.h index 2662f064eac..9c60d255526 100644 --- a/sys/arch/zaurus/stand/zboot/compat_linux.h +++ b/sys/arch/zaurus/stand/zboot/compat_linux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: compat_linux.h,v 1.7 2005/05/24 20:38:20 uwe Exp $ */ +/* $OpenBSD: compat_linux.h,v 1.8 2007/06/16 00:26:33 deraadt Exp $ */ /* * Copyright (c) 2005 Uwe Stuehler <uwe@bsdx.de> @@ -42,7 +42,7 @@ struct proc; #define SEEK_SET 0 #define SEEK_CUR 1 -#define EOVERFLOW 75 +#define LINUX_EOVERFLOW 75 #define termios linux_termios diff --git a/sys/arch/zaurus/stand/zboot/unixdev.c b/sys/arch/zaurus/stand/zboot/unixdev.c index d0d52a5e063..8d745feed12 100644 --- a/sys/arch/zaurus/stand/zboot/unixdev.c +++ b/sys/arch/zaurus/stand/zboot/unixdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unixdev.c,v 1.5 2005/05/24 20:38:20 uwe Exp $ */ +/* $OpenBSD: unixdev.c,v 1.6 2007/06/16 00:26:33 deraadt Exp $ */ /* * Copyright (c) 1996-1998 Michael Shalayeff @@ -192,11 +192,11 @@ ulseek(int fd, off_t off, int wh) while (off > OFFT_OFFSET_MAX) { off -= OFFT_OFFSET_MAX; if (ulseek32(fd, OFFT_OFFSET_MAX, SEEK_CUR) < 0 && - errno != EOVERFLOW) + errno != LINUX_EOVERFLOW) return -1; } r = ulseek32(fd, (long)off, SEEK_CUR); - if (r == -1 && errno == EOVERFLOW) + if (r == -1 && errno == LINUX_EOVERFLOW) r = off; } else r = ulseek32(fd, (long)off, wh); |