diff options
Diffstat (limited to 'sys/arch/hppa')
| -rw-r--r-- | sys/arch/hppa/include/cpu.h | 3 | ||||
| -rw-r--r-- | sys/arch/hppa/include/pmap.h | 13 |
2 files changed, 3 insertions, 13 deletions
diff --git a/sys/arch/hppa/include/cpu.h b/sys/arch/hppa/include/cpu.h index c3fd832a235..4ad87f3a2f1 100644 --- a/sys/arch/hppa/include/cpu.h +++ b/sys/arch/hppa/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.97 2022/12/06 00:40:09 cheloha Exp $ */ +/* $OpenBSD: cpu.h,v 1.98 2023/01/01 19:49:17 miod Exp $ */ /* * Copyright (c) 2000-2004 Michael Shalayeff @@ -191,7 +191,6 @@ extern int cpu_hvers; */ #define HPPA_PGALIAS 0x00400000 -#define HPPA_PGAMASK 0xffc00000 #define HPPA_PGAOFF 0x003fffff #define HPPA_IOBEGIN 0xf0000000 diff --git a/sys/arch/hppa/include/pmap.h b/sys/arch/hppa/include/pmap.h index 3177608e3c0..cfcea8f9aad 100644 --- a/sys/arch/hppa/include/pmap.h +++ b/sys/arch/hppa/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.52 2022/10/25 18:44:36 miod Exp $ */ +/* $OpenBSD: pmap.h,v 1.53 2023/01/01 19:49:17 miod Exp $ */ /* * Copyright (c) 2002-2004 Michael Shalayeff @@ -91,16 +91,7 @@ struct vm_page *pmap_unmap_direct(vaddr_t); * according to the parisc manual aliased va's should be * different by high 12 bits only. */ -#define PMAP_PREFER(o,h) pmap_prefer(o, h) -static __inline__ vaddr_t -pmap_prefer(vaddr_t offs, vaddr_t hint) -{ - vaddr_t pmap_prefer_hint = (hint & HPPA_PGAMASK) | (offs & HPPA_PGAOFF); - if (pmap_prefer_hint < hint) - pmap_prefer_hint += HPPA_PGALIAS; - return pmap_prefer_hint; -} - +#define PMAP_PREFER /* pmap prefer alignment */ #define PMAP_PREFER_ALIGN() (HPPA_PGALIAS) /* pmap prefer offset within alignment */ |