diff options
| author |   uebayasi <uebayasi@openbsd.org> | 2014-10-15 15:54:47 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi@openbsd.org> | 2014-10-15 15:54:47 +0000 |
| commit | c4fed89384ce3c41a712f75f79d49077fe823f3b (patch) | |
| tree | 79136de1a36f2ce5e444a0195dd1cdd9eee5610c | |
| parent | Clear protocol options before optionally setting them. (diff) | |
| download | wireguard-openbsd-c4fed89384ce3c41a712f75f79d49077fe823f3b.tar.xz wireguard-openbsd-c4fed89384ce3c41a712f75f79d49077fe823f3b.zip | |
Revert previous (wrong commit message).
| -rw-r--r-- | sys/arch/amd64/amd64/db_interface.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/pckbc.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/arch/amd64/amd64/db_interface.c b/sys/arch/amd64/amd64/db_interface.c index ebf98df73ce..4aae2aa3252 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.19 2014/10/15 13:36:45 uebayasi Exp $ */ +/* $OpenBSD: db_interface.c,v 1.20 2014/10/15 15:54:47 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) - CPU_BUSY_CYCLE(); + ; /* Do nothing */ mtx_enter(&ddb_mp_mutex); } diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c index 2bc230732f6..a8d5a0f422a 100644 --- a/sys/dev/ic/pckbc.c +++ b/sys/dev/ic/pckbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pckbc.c,v 1.40 2014/10/15 13:36:45 uebayasi Exp $ */ +/* $OpenBSD: pckbc.c,v 1.41 2014/10/15 15:54:47 uebayasi Exp $ */ /* $NetBSD: pckbc.c,v 1.5 2000/06/09 04:58:35 soda Exp $ */ /* @@ -37,7 +37,6 @@ #include <sys/lock.h> #include <machine/bus.h> -#include <machine/cpu.h> #include <dev/ic/i8042reg.h> #include <dev/ic/pckbcvar.h> @@ -152,7 +151,6 @@ 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) { |