hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-24 17:44:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'freebsd/current/master' into hardened/current/master

Browse Source
This commit is contained in:
Oliver Pinter + 2016-04-28 05:24:41 +02:00
commit 74a1d6f78d
6 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/compat/ndis/subr_ndis.c
View File

@ -896,7 +896,7 @@ NdisReadPciSlotInformation(adapter, slot, offset, buf, len)
uint32_t len;
{
ndis_miniport_block *block;
int i;
uint32_t i;
char *dest;
device_t dev;
@ -939,7 +939,7 @@ NdisWritePciSlotInformation(adapter, slot, offset, buf, len)
uint32_t len;
{
ndis_miniport_block *block;
int i;
uint32_t i;
char *dest;
device_t dev;
@ -2432,7 +2432,7 @@ NdisReadPcmciaAttributeMemory(handle, offset, buf, len)
bus_space_handle_t bh;
bus_space_tag_t bt;
char *dest;
int i;
uint32_t i;
if (handle == NULL)
return (0);
@ -2462,7 +2462,7 @@ NdisWritePcmciaAttributeMemory(handle, offset, buf, len)
bus_space_handle_t bh;
bus_space_tag_t bt;
char *src;
int i;
uint32_t i;
if (handle == NULL)
return (0);
@ -2670,7 +2670,7 @@ ndis_find_sym(lf, filename, suffix, sym)
{
char *fullsym;
char *suf;
int i;
size_t i;
fullsym = ExAllocatePoolWithTag(NonPagedPool, MAXPATHLEN, 0);
if (fullsym == NULL)

6
sys/dev/acpica/acpivar.h
View File

@ -505,9 +505,9 @@ SYSCTL_DECL(_debug_acpi);
*
* Returns the VM domain ID if found, or -1 if not found / invalid.
*/
extern int acpi_map_pxm_to_vm_domainid(int pxm);
extern int acpi_get_domain(device_t dev, device_t child, int *domain);
extern int acpi_parse_pxm(device_t dev, int *domain);
int acpi_map_pxm_to_vm_domainid(int pxm);
int acpi_get_domain(device_t dev, device_t child, int *domain);
int acpi_parse_pxm(device_t dev, int *domain);
#endif /* _KERNEL */
#endif /* !_ACPIVAR_H_ */

2
sys/fs/devfs/devfs_vnops.c
View File

@ -1444,7 +1444,7 @@ devfs_revoke(struct vop_revoke_args *ap)
struct cdev *dev;
struct cdev_priv *cdp;
struct devfs_dirent *de;
int i;
u_int i;
KASSERT((ap->a_flags & REVOKEALL) != 0, ("devfs_revoke !REVOKEALL"));

6
sys/netinet/ip_divert.c
View File

@ -765,9 +765,6 @@ static int
div_modevent(module_t mod, int type, void *unused)
{
int err = 0;
#ifndef VIMAGE
int n;
#endif
switch (type) {
case MOD_LOAD:
@ -808,8 +805,7 @@ div_modevent(module_t mod, int type, void *unused)
* we destroy the lock.
*/
INP_INFO_WLOCK(&V_divcbinfo);
n = V_divcbinfo.ipi_count;
if (n != 0) {
if (V_divcbinfo.ipi_count != 0) {
err = EBUSY;
INP_INFO_WUNLOCK(&V_divcbinfo);
break;

2
sys/netinet/tcp_lro.c
View File

@ -569,7 +569,7 @@ tcp_lro_rx(struct lro_ctrl *lc, struct mbuf *m, uint32_t csum)
if ((th->th_flags & ~(TH_ACK | TH_PUSH)) != 0)
return (TCP_LRO_CANNOT);
/* XXX-BZ We lose a ACK|PUSH flag concatinating multiple segments. */
/* XXX-BZ We lose a ACK|PUSH flag concatenating multiple segments. */
/* XXX-BZ Ideally we'd flush on PUSH? */
/*

2
sys/vm/vm_map.c
View File

@ -358,7 +358,7 @@ vmspace_free(struct vmspace *vm)
{
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
"vmspace_free() called with non-sleepable lock held");
"vmspace_free() called");
if (vm->vm_refcnt == 0)
panic("vmspace_free: attempt to free already freed vmspace");