Module Name:    src
Committed By:   mrg
Date:           Wed Dec 19 11:02:21 UTC 2018

Modified Files:
        src/lib/libkvm: kvm_aarch64.c

Log Message:
be consistent about uint64_t and bit masks.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libkvm/kvm_aarch64.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libkvm/kvm_aarch64.c
diff -u src/lib/libkvm/kvm_aarch64.c:1.7 src/lib/libkvm/kvm_aarch64.c:1.8
--- src/lib/libkvm/kvm_aarch64.c:1.7	Wed Dec 19 11:00:09 2018
+++ src/lib/libkvm/kvm_aarch64.c	Wed Dec 19 11:02:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_aarch64.c,v 1.7 2018/12/19 11:00:09 mrg Exp $ */
+/* $NetBSD: kvm_aarch64.c,v 1.8 2018/12/19 11:02:21 mrg Exp $ */
 
 /*-
  * Copyright (c) 2014, 2018 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
 
 #include "kvm_private.h"
 
-__RCSID("$NetBSD: kvm_aarch64.c,v 1.7 2018/12/19 11:00:09 mrg Exp $");
+__RCSID("$NetBSD: kvm_aarch64.c,v 1.8 2018/12/19 11:02:21 mrg Exp $");
 
 /*ARGSUSED*/
 void
@@ -146,7 +146,7 @@ lose:
 
 		if ((pte & LX_TYPE) == LX_TYPE_BLK) {
 			const size_t blk_size = 1 << addr_shift;
-			const paddr_t blk_mask = __BITS(addr_shift - 1, 0);
+			const uint64_t blk_mask = __BITS(addr_shift - 1, 0);
 
 			*pa = (pte & page_addr & ~blk_mask) | (va & blk_mask);
 			return blk_size - (va & blk_mask);

Reply via email to