Module Name: src
Committed By: matt
Date: Wed Jan 1 16:09:04 UTC 2014
Modified Files:
src/sys/arch/alpha/include: pmap.h
Log Message:
Fix PMAP_SIZEOF() to deal with that the pmap has 0 pmap_asn_info now.
Addresses PR/48488.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/alpha/include/pmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/include/pmap.h
diff -u src/sys/arch/alpha/include/pmap.h:1.78 src/sys/arch/alpha/include/pmap.h:1.79
--- src/sys/arch/alpha/include/pmap.h:1.78 Mon Nov 4 19:57:29 2013
+++ src/sys/arch/alpha/include/pmap.h Wed Jan 1 16:09:04 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.78 2013/11/04 19:57:29 christos Exp $ */
+/* $NetBSD: pmap.h,v 1.79 2014/01/01 16:09:04 matt Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -146,12 +146,10 @@ struct pmap {
};
/*
- * Compute the sizeof of a pmap structure. Subtract one because one
- * ASN info structure is already included in the pmap structure itself.
+ * Compute the sizeof of a pmap structure.
*/
#define PMAP_SIZEOF(x) \
- (ALIGN(sizeof(struct pmap) + \
- (sizeof(struct pmap_asn_info) * ((x) - 1))))
+ (ALIGN(offsetof(struct pmap, pm_asni[(x)])))
#define PMAP_ASN_RESERVED 0 /* reserved for Lev1map users */
