Back out hasty previous commit -- bitwise arithmetic does not always match
integer arithmetic, as demonstrated in this case.
This commit is contained in:
parent
1c3c44683b
commit
95e98b18f7
@ -1,4 +1,4 @@
|
|||||||
/* $NetBSD: ip2x.c,v 1.7 2004/01/12 11:53:31 sekiya Exp $ */
|
/* $NetBSD: ip2x.c,v 1.8 2004/01/12 12:50:07 sekiya Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2001, 2002 Rafal K. Boni
|
* Copyright (c) 2001, 2002 Rafal K. Boni
|
||||||
@ -28,7 +28,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
__KERNEL_RCSID(0, "$NetBSD: ip2x.c,v 1.7 2004/01/12 11:53:31 sekiya Exp $");
|
__KERNEL_RCSID(0, "$NetBSD: ip2x.c,v 1.8 2004/01/12 12:50:07 sekiya Exp $");
|
||||||
|
|
||||||
#include "opt_cputype.h"
|
#include "opt_cputype.h"
|
||||||
#include "opt_machtypes.h"
|
#include "opt_machtypes.h"
|
||||||
@ -242,7 +242,7 @@ ip2x_mappable_intr(void *arg)
|
|||||||
|
|
||||||
ret = 0;
|
ret = 0;
|
||||||
mstat = bus_space_read_4(iot, ioh, INT2_MAP_STATUS);
|
mstat = bus_space_read_4(iot, ioh, INT2_MAP_STATUS);
|
||||||
mmask = bus_space_read_4(iot, ioh, INT2_MAP_MASK0 | (which << 2));
|
mmask = bus_space_read_4(iot, ioh, INT2_MAP_MASK0 + (which << 2));
|
||||||
|
|
||||||
mstat &= mmask;
|
mstat &= mmask;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user