diff options
author | phk <phk@FreeBSD.org> | 2002-06-19 08:37:02 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2002-06-19 08:37:02 +0000 |
commit | 1f4e9c0c72c46d8157e0c5cca3ab6dc9b1faeb96 (patch) | |
tree | 26340bfd6f096ee606f3766102d9ad17eaaf1991 | |
parent | 07d27b9d0a6f77cfd05cc0a2a2b6a3b9446e32a9 (diff) | |
download | FreeBSD-src-1f4e9c0c72c46d8157e0c5cca3ab6dc9b1faeb96.zip FreeBSD-src-1f4e9c0c72c46d8157e0c5cca3ab6dc9b1faeb96.tar.gz |
Remove the compat bits for the mis-aligned struct disklabel on alpha,
people got three times longer than I promised.
Sponsored by: DARPA & NAI Labs.
-rw-r--r-- | sys/kern/sys_generic.c | 22 | ||||
-rw-r--r-- | sys/sys/disklabel.h | 14 | ||||
-rw-r--r-- | sys/sys/diskmbr.h | 14 | ||||
-rw-r--r-- | sys/sys/diskpc98.h | 14 |
4 files changed, 0 insertions, 64 deletions
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index bca9f14..bec5cca 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -646,28 +646,6 @@ ioctl(td, uap) *(caddr_t *)data = uap->data; } -#ifdef __alpha__ - { - int annoy = 1; - - if (com == DIOCGDINFO_ALPHAHACK) - com = DIOCGDINFO; - else if (com == DIOCSDINFO_ALPHAHACK) - com = DIOCSDINFO; - else if (com == DIOCWDINFO_ALPHAHACK) - com = DIOCWDINFO; - else if (com == DIOCGDVIRGIN_ALPHAHACK) - com = DIOCGDVIRGIN; - else - annoy = 0; - if (annoy) { - uprintf("Recompile this program, it uses obsolete ioctls.\n"); - printf("Program using uses obsolete ioctls used, recompile.\n"); - tsleep(&annoy, PPAUSE, "syncer", 15 * hz); - } - } -#endif - switch (com) { case FIONBIO: diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index 2c46c72..2a58132 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -358,20 +358,6 @@ CTASSERT(sizeof (struct dos_partition) == 16); #define DIOCWLABEL _IOW('d', 109, int) /* write en/disable label */ -#ifdef __alpha__ -struct disklabel_alphahack { - struct disklabel dl; - char pad[4]; -}; -#define DIOCGDINFO_ALPHAHACK _IOR('d', 101, struct disklabel_alphahack)/* get */ -#define DIOCSDINFO_ALPHAHACK _IOW('d', 102, struct disklabel_alphahack)/* set */ -#define DIOCWDINFO_ALPHAHACK _IOW('d', 103, struct disklabel_alphahack)/* set, update disk */ -#define DIOCGDVIRGIN_ALPHAHACK _IOR('d', 105, struct disklabel_alphahack)/* get virgin label */ -#ifdef CTASSERT -CTASSERT(sizeof(struct disklabel_alphahack) == 280); -#endif -#endif - #ifdef _KERNEL /* diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h index 2c46c72..2a58132 100644 --- a/sys/sys/diskmbr.h +++ b/sys/sys/diskmbr.h @@ -358,20 +358,6 @@ CTASSERT(sizeof (struct dos_partition) == 16); #define DIOCWLABEL _IOW('d', 109, int) /* write en/disable label */ -#ifdef __alpha__ -struct disklabel_alphahack { - struct disklabel dl; - char pad[4]; -}; -#define DIOCGDINFO_ALPHAHACK _IOR('d', 101, struct disklabel_alphahack)/* get */ -#define DIOCSDINFO_ALPHAHACK _IOW('d', 102, struct disklabel_alphahack)/* set */ -#define DIOCWDINFO_ALPHAHACK _IOW('d', 103, struct disklabel_alphahack)/* set, update disk */ -#define DIOCGDVIRGIN_ALPHAHACK _IOR('d', 105, struct disklabel_alphahack)/* get virgin label */ -#ifdef CTASSERT -CTASSERT(sizeof(struct disklabel_alphahack) == 280); -#endif -#endif - #ifdef _KERNEL /* diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h index 2c46c72..2a58132 100644 --- a/sys/sys/diskpc98.h +++ b/sys/sys/diskpc98.h @@ -358,20 +358,6 @@ CTASSERT(sizeof (struct dos_partition) == 16); #define DIOCWLABEL _IOW('d', 109, int) /* write en/disable label */ -#ifdef __alpha__ -struct disklabel_alphahack { - struct disklabel dl; - char pad[4]; -}; -#define DIOCGDINFO_ALPHAHACK _IOR('d', 101, struct disklabel_alphahack)/* get */ -#define DIOCSDINFO_ALPHAHACK _IOW('d', 102, struct disklabel_alphahack)/* set */ -#define DIOCWDINFO_ALPHAHACK _IOW('d', 103, struct disklabel_alphahack)/* set, update disk */ -#define DIOCGDVIRGIN_ALPHAHACK _IOR('d', 105, struct disklabel_alphahack)/* get virgin label */ -#ifdef CTASSERT -CTASSERT(sizeof(struct disklabel_alphahack) == 280); -#endif -#endif - #ifdef _KERNEL /* |