d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove _FreeBSD_version check for something that was only an issue with

Browse Source 
9-CURRENT.

Obtained from:  Netlfix, Inc
MFC after:      3 days
This commit is contained in:
Scott Long 2015-10-16 17:56:43 +00:00
parent a41dab8fc9
commit d0be3479d5
5 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/mpr/mpr.c
View File

@ -1471,11 +1471,9 @@ mpr_setup_sysctl(struct mpr_softc *sc)
OID_AUTO, "enable_ssu", CTLFLAG_RW, &sc->enable_ssu, 0,
"enable SSU to SATA SSD/HDD at shutdown");
#if __FreeBSD_version >= 900030
SYSCTL_ADD_UQUAD(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree),
OID_AUTO, "chain_alloc_fail", CTLFLAG_RD,
&sc->chain_alloc_fail, "chain allocation failures");
#endif //FreeBSD_version >= 900030
SYSCTL_ADD_INT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree),
OID_AUTO, "spinup_wait_time", CTLFLAG_RD,

7
sys/dev/mpr/mprvar.h
View File

@ -265,9 +265,7 @@ struct mpr_softc {
int chain_free_lowwater;
u_int enable_ssu;
int spinup_wait_time;
#if __FreeBSD_version >= 900030
uint64_t chain_alloc_fail;
#endif
struct sysctl_ctx_list sysctl_ctx;
struct sysctl_oid *sysctl_tree;
char fw_version[16];
@ -451,11 +449,8 @@ mpr_alloc_chain(struct mpr_softc *sc)
sc->chain_free--;
if (sc->chain_free < sc->chain_free_lowwater)
sc->chain_free_lowwater = sc->chain_free;
}
#if __FreeBSD_version >= 900030
else
} else
sc->chain_alloc_fail++;
#endif
return (chain);
}

2
sys/dev/mps/mps.c
View File

@ -1468,11 +1468,9 @@ mps_setup_sysctl(struct mps_softc *sc)
OID_AUTO, "enable_ssu", CTLFLAG_RW, &sc->enable_ssu, 0,
"enable SSU to SATA SSD/HDD at shutdown");
#if __FreeBSD_version >= 900030
SYSCTL_ADD_UQUAD(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree),
OID_AUTO, "chain_alloc_fail", CTLFLAG_RD,
&sc->chain_alloc_fail, "chain allocation failures");
#endif //FreeBSD_version >= 900030
SYSCTL_ADD_INT(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree),
OID_AUTO, "spinup_wait_time", CTLFLAG_RD,

1
sys/dev/mps/mps_sas.h
View File

@ -58,7 +58,6 @@ struct mpssas_target {
uint16_t tid;
SLIST_HEAD(, mpssas_lun) luns;
TAILQ_HEAD(, mps_command) commands;
struct mps_command *tm;
TAILQ_HEAD(, mps_command) timedout_commands;
uint16_t exp_dev_handle;

7
sys/dev/mps/mpsvar.h
View File

@ -283,9 +283,7 @@ struct mps_softc {
int chain_free_lowwater;
u_int enable_ssu;
int spinup_wait_time;
#if __FreeBSD_version >= 900030
uint64_t chain_alloc_fail;
#endif
struct sysctl_ctx_list sysctl_ctx;
struct sysctl_oid *sysctl_tree;
char fw_version[16];
@ -483,11 +481,8 @@ mps_alloc_chain(struct mps_softc *sc)
sc->chain_free--;
if (sc->chain_free < sc->chain_free_lowwater)
sc->chain_free_lowwater = sc->chain_free;
}
#if __FreeBSD_version >= 900030
else
} else
sc->chain_alloc_fail++;
#endif
return (chain);
}