diff options
| author | Masao Uebayashi <uebayasi@cvs.openbsd.org> | 2014-10-15 13:36:46 +0000 |
|---|---|---|
| committer | Masao Uebayashi <uebayasi@cvs.openbsd.org> | 2014-10-15 13:36:46 +0000 |
| commit | 31fea743455ebd659522dc0eb30e5447d2ea5442 (patch) | |
| tree | 43e450c87ce26158582c22b6745ea35da7ba76ab /sys | |
| parent | bfce7bd99a824f73aeda1716b89493f43097d386 (diff) | |
pppx(4): Correct pppx_dev_lookup() and pppx_dev2pxd() local declarations
Those two functions take one dev_t argument, not int. Match declarations
with reality. No functional changes.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/db_interface.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/pckbc.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/amd64/amd64/db_interface.c b/sys/arch/amd64/amd64/db_interface.c index a68c34b25aa..ebf98df73ce 100644 --- a/sys/arch/amd64/amd64/db_interface.c +++ b/sys/arch/amd64/amd64/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.18 2014/09/14 14:17:23 jsg Exp $ */ +/* $OpenBSD: db_interface.c,v 1.19 2014/10/15 13:36:45 uebayasi Exp $ */ /* $NetBSD: db_interface.c,v 1.1 2003/04/26 18:39:27 fvdl Exp $ */ /* @@ -312,7 +312,7 @@ db_enter_ddb(void) /* Busy wait without locking, we'll confirm with lock later */ while (ddb_active_cpu != cpu_number() && curcpu()->ci_ddb_paused != CI_DDB_RUNNING) - ; /* Do nothing */ + CPU_BUSY_CYCLE(); mtx_enter(&ddb_mp_mutex); } diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c index 668f2cf2651..2bc230732f6 100644 --- a/sys/dev/ic/pckbc.c +++ b/sys/dev/ic/pckbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pckbc.c,v 1.39 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: pckbc.c,v 1.40 2014/10/15 13:36:45 uebayasi Exp $ */ /* $NetBSD: pckbc.c,v 1.5 2000/06/09 04:58:35 soda Exp $ */ /* @@ -37,6 +37,7 @@ #include <sys/lock.h> #include <machine/bus.h> +#include <machine/cpu.h> #include <dev/ic/i8042reg.h> #include <dev/ic/pckbcvar.h> @@ -151,6 +152,7 @@ pckbc_poll_data1(bus_space_tag_t iot, bus_space_handle_t ioh_d, register u_char c; KBD_DELAY; + CPU_BUSY_CYCLE(); c = bus_space_read_1(iot, ioh_d, 0); if (checkaux && (stat & 0x20)) { /* aux data */ if (slot != PCKBC_AUX_SLOT) { |