diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-07-08 13:31:30 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-07-08 13:31:30 +0000 |
| commit | 712672ebb82abdc581e55c821257f2155c389d73 (patch) | |
| tree | d26c949ae5a32506f17daaa6aa198e41c58897ff | |
| parent | rearrange some includes. also, pull in uvm/uvm.h because soon sysctl.h (diff) | |
| download | wireguard-openbsd-712672ebb82abdc581e55c821257f2155c389d73.tar.xz wireguard-openbsd-712672ebb82abdc581e55c821257f2155c389d73.zip | |
This is bootblock code. Don't pull in uvm header files to deal with
page rounding! Disgusting. Instead, define local copies of those
macros.
| -rw-r--r-- | sys/arch/i386/stand/libsa/apmprobe.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/arch/i386/stand/libsa/apmprobe.c b/sys/arch/i386/stand/libsa/apmprobe.c index c222e12aea8..b27fe948679 100644 --- a/sys/arch/i386/stand/libsa/apmprobe.c +++ b/sys/arch/i386/stand/libsa/apmprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apmprobe.c,v 1.17 2014/03/29 18:09:29 guenther Exp $ */ +/* $OpenBSD: apmprobe.c,v 1.18 2014/07/08 13:31:30 deraadt Exp $ */ /* * Copyright (c) 1997-2000 Michael Shalayeff @@ -54,15 +54,11 @@ #include "libsa.h" #include <stand/boot/bootarg.h> -#include <uvm/uvm_extern.h> - #include <dev/isa/isareg.h> #include <machine/apmvar.h> #include <machine/biosvar.h> -#define vm_page_size 4096 - #include "debug.h" extern int debug; @@ -193,6 +189,9 @@ apmprobe(void) } } +#define round_page(x) (((x) + PAGE_MASK) & ~PAGE_MASK) +#define trunc_page(x) ((x) & ~PAGE_MASK) + void apmfixmem(void) { |