Module Name: src
Committed By: mrg
Date: Thu Jun 17 06:38:19 UTC 2010
Modified Files:
src/sys/arch/x86/x86: mtrr_i686.c
Log Message:
when complaining we don't support this many MTRR's, say how many there are.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/x86/mtrr_i686.c
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/x86/x86/mtrr_i686.c
diff -u src/sys/arch/x86/x86/mtrr_i686.c:1.20 src/sys/arch/x86/x86/mtrr_i686.c:1.21
--- src/sys/arch/x86/x86/mtrr_i686.c:1.20 Sat Nov 21 03:11:01 2009
+++ src/sys/arch/x86/x86/mtrr_i686.c Thu Jun 17 06:38:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mtrr_i686.c,v 1.20 2009/11/21 03:11:01 rmind Exp $ */
+/* $NetBSD: mtrr_i686.c,v 1.21 2010/06/17 06:38:19 mrg Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mtrr_i686.c,v 1.20 2009/11/21 03:11:01 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mtrr_i686.c,v 1.21 2010/06/17 06:38:19 mrg Exp $");
#include "opt_multiprocessor.h"
@@ -301,8 +301,8 @@
i686_mtrr_vcnt = i686_mtrr_cap & MTRR_I686_CAP_VCNT_MASK;
if (i686_mtrr_vcnt > MTRR_I686_NVAR_MAX)
- printf("\%s: FIXME: more than %d MTRRs\n", __FILE__,
- MTRR_I686_NVAR_MAX);
+ printf("\%s: FIXME: more than %d MTRRs (%d)\n", __FILE__,
+ MTRR_I686_NVAR_MAX, i686_mtrr_vcnt);
else if (i686_mtrr_vcnt < MTRR_I686_NVAR_MAX) {
for (i = MTRR_I686_NVAR_MAX - i686_mtrr_vcnt; i; i--) {
mtrr_raw[16 - (i*2)].msraddr = 0;
