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.
This commit is contained in:
parent
f8bd33a0ae
commit
c4bacc1871
@ -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:
|
||||
|
@ -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
|
||||
|
||||
/*
|
||||
|
@ -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
|
||||
|
||||
/*
|
||||
|
@ -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
|
||||
|
||||
/*
|
||||
|
Loading…
x
Reference in New Issue
Block a user