diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-08-09 03:06:56 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-08-09 03:06:56 +0000 |
| commit | a66795c004ebf886e2e6470c4172c78bbdb62bf3 (patch) | |
| tree | 11bcd1294fc5d2acf27fbc176dd9203ba013d3aa /sys/arch | |
| parent | 856ead4497ec159bf93272b8f915c6a7a7355d60 (diff) | |
remove duplicated PAGE macros and drop type suffix
ok kettenis@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/arm64/arm64/support.S | 3 | ||||
| -rw-r--r-- | sys/arch/arm64/include/param.h | 6 | ||||
| -rw-r--r-- | sys/arch/arm64/include/vmparam.h | 9 |
3 files changed, 6 insertions, 12 deletions
diff --git a/sys/arch/arm64/arm64/support.S b/sys/arch/arm64/arm64/support.S index 4ef0958a486..ea0212b59ae 100644 --- a/sys/arch/arm64/arm64/support.S +++ b/sys/arch/arm64/arm64/support.S @@ -1,4 +1,4 @@ -/* $OpenBSD: support.S,v 1.5 2017/01/25 10:23:17 patrick Exp $ */ +/* $OpenBSD: support.S,v 1.6 2017/08/09 03:06:55 jsg Exp $ */ /*- * Copyright (c) 2014 Andrew Turner * Copyright (c) 2014-2015 The FreeBSD Foundation @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD: head/sys/arm64/arm64/support.S 297615 2016-04-06 14:08:10Z a #endif #include <machine/setjmp.h> +#include <machine/param.h> #include <machine/vmparam.h> #include "assym.h" diff --git a/sys/arch/arm64/include/param.h b/sys/arch/arm64/include/param.h index 9d6b5f93a78..d2e385cfb9b 100644 --- a/sys/arch/arm64/include/param.h +++ b/sys/arch/arm64/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.1 2016/12/17 23:38:33 patrick Exp $ */ +/* $OpenBSD: param.h,v 1.2 2017/08/09 03:06:55 jsg Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -46,8 +46,8 @@ #define MID_MACHINE MID_ARM64 #define PAGE_SHIFT 12 -#define PAGE_SIZE (1LL << PAGE_SHIFT) -#define PAGE_MASK ((vaddr_t)PAGE_SIZE - 1) +#define PAGE_SIZE (1 << PAGE_SHIFT) +#define PAGE_MASK (PAGE_SIZE - 1) #define KERNBASE 0xffffff8000000000ULL /* start of kernel virtual space */ diff --git a/sys/arch/arm64/include/vmparam.h b/sys/arch/arm64/include/vmparam.h index e317163ec25..79ecd636f3e 100644 --- a/sys/arch/arm64/include/vmparam.h +++ b/sys/arch/arm64/include/vmparam.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vmparam.h,v 1.2 2017/05/27 09:54:43 kettenis Exp $ */ +/* $OpenBSD: vmparam.h,v 1.3 2017/08/09 03:06:55 jsg Exp $ */ /* $NetBSD: vmparam.h,v 1.1 2003/04/26 18:39:49 fvdl Exp $ */ /*- @@ -79,13 +79,6 @@ #define USRIOSIZE 300 /* - * Page sizes - */ -#define PAGE_SHIFT 12 -#define PAGE_SIZE (1LL << PAGE_SHIFT) -#define PAGE_MASK ((vaddr_t)PAGE_SIZE - 1) - -/* * Kernel base */ #define KERNEL_BASE 0xffffff8000000000ULL |