svn commit: r261985 - in stable/10/sys/ia64: ia64 include

[Marcel Moolenaar]

Author: marcel
Date: Sun Feb 16 19:12:50 2014
New Revision: 261985
URL: http://svnweb.freebsd.org/changeset/base/261985

Log:
  MFC r257487:
  Use LOG2_ID_PAGE_SIZE again for the identity mapping in regions 6 & 7.

Modified:
  stable/10/sys/ia64/ia64/machdep.c
  stable/10/sys/ia64/ia64/mp_machdep.c
  stable/10/sys/ia64/include/param.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/ia64/ia64/machdep.c
==============================================================================
--- stable/10/sys/ia64/ia64/machdep.c	Sun Feb 16 19:08:10 2014	(r261984)
+++ stable/10/sys/ia64/ia64/machdep.c	Sun Feb 16 19:12:50 2014	(r261985)
@@ -716,8 +716,8 @@ ia64_init(void)
 	 * handlers. Here we just make sure that they have the largest
 	 * possible page size to minimise TLB usage.
 	 */
-	ia64_set_rr(IA64_RR_BASE(6), (6 << 8) | (PAGE_SHIFT << 2));
-	ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (PAGE_SHIFT << 2));
+	ia64_set_rr(IA64_RR_BASE(6), (6 << 8) | (LOG2_ID_PAGE_SIZE << 2));
+	ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (LOG2_ID_PAGE_SIZE << 2));
 	ia64_srlz_d();
 
 	/* Initialize/setup physical memory datastructures */

Modified: stable/10/sys/ia64/ia64/mp_machdep.c
==============================================================================
--- stable/10/sys/ia64/ia64/mp_machdep.c	Sun Feb 16 19:08:10 2014	(r261984)
+++ stable/10/sys/ia64/ia64/mp_machdep.c	Sun Feb 16 19:12:50 2014	(r261985)
@@ -206,8 +206,8 @@ ia64_ap_startup(void)
 	ia64_ap_state.as_trace = 0x100;
 
 	ia64_set_rr(IA64_RR_BASE(5), (5 << 8) | (PAGE_SHIFT << 2) | 1);
-	ia64_set_rr(IA64_RR_BASE(6), (6 << 8) | (PAGE_SHIFT << 2));
-	ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (PAGE_SHIFT << 2));
+	ia64_set_rr(IA64_RR_BASE(6), (6 << 8) | (LOG2_ID_PAGE_SIZE << 2));
+	ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (LOG2_ID_PAGE_SIZE << 2));
 	ia64_srlz_d();
 
 	pcpup = ia64_ap_state.as_pcpu;

Modified: stable/10/sys/ia64/include/param.h
==============================================================================
--- stable/10/sys/ia64/include/param.h	Sun Feb 16 19:08:10 2014	(r261984)
+++ stable/10/sys/ia64/include/param.h	Sun Feb 16 19:12:50 2014	(r261985)
@@ -105,6 +105,11 @@
 #endif
 #define	KSTACK_GUARD_PAGES 0		/* pages of kstack guard; 0 disables */
 
+/* The default size of identity mappings in region 6 & 7. */
+#ifndef LOG2_ID_PAGE_SIZE
+#define	LOG2_ID_PAGE_SIZE	16
+#endif
+
 /*
  * Mach derived conversion macros
  */