Module Name: src
Committed By: cherry
Date: Fri Sep 9 11:38:21 UTC 2011
Modified Files:
src/sys/arch/x86/x86 [cherry-xenmp]: pmap.c
src/sys/arch/xen/include [cherry-xenmp]: xenpmap.h
Log Message:
make #define PG_k visible on all xen archs
To generate a diff of this commit:
cvs rdiff -u -r1.121.2.6 -r1.121.2.7 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.27.2.3 -r1.27.2.4 src/sys/arch/xen/include/xenpmap.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/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.121.2.6 src/sys/arch/x86/x86/pmap.c:1.121.2.7
--- src/sys/arch/x86/x86/pmap.c:1.121.2.6 Sat Aug 20 19:22:47 2011
+++ src/sys/arch/x86/x86/pmap.c Fri Sep 9 11:38:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.121.2.6 2011/08/20 19:22:47 cherry Exp $ */
+/* $NetBSD: pmap.c,v 1.121.2.7 2011/09/09 11:38:20 cherry Exp $ */
/*-
* Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.121.2.6 2011/08/20 19:22:47 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.121.2.7 2011/09/09 11:38:20 cherry Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -211,13 +211,6 @@
#include <xen/hypervisor.h>
#endif
-/* flag to be used for kernel mappings: PG_u on Xen/amd64, 0 otherwise */
-#if defined(XEN) && defined(__x86_64__)
-#define PG_k PG_u
-#else
-#define PG_k 0
-#endif
-
/*
* general info:
*
Index: src/sys/arch/xen/include/xenpmap.h
diff -u src/sys/arch/xen/include/xenpmap.h:1.27.2.3 src/sys/arch/xen/include/xenpmap.h:1.27.2.4
--- src/sys/arch/xen/include/xenpmap.h:1.27.2.3 Wed Aug 17 09:40:39 2011
+++ src/sys/arch/xen/include/xenpmap.h Fri Sep 9 11:38:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xenpmap.h,v 1.27.2.3 2011/08/17 09:40:39 cherry Exp $ */
+/* $NetBSD: xenpmap.h,v 1.27.2.4 2011/09/09 11:38:20 cherry Exp $ */
/*
*
@@ -34,6 +34,13 @@
#include "opt_xen.h"
#endif
+/* flag to be used for kernel mappings: PG_u on Xen/amd64, 0 otherwise */
+#if defined(XEN) && defined(__x86_64__)
+#define PG_k PG_u
+#else
+#define PG_k 0
+#endif
+
#define INVALID_P2M_ENTRY (~0UL)
#ifdef MULTIPROCESSOR
