6510878 Kernel Boot time data structures can be mapped with Large pages to improve performance

2 files changed, 6 insertions, 9 deletions

diff --git a/usr/src/uts/sfmmu/vm/hat_sfmmu.c b/usr/src/uts/sfmmu/vm/hat_sfmmu.c
index 95b4165346..fb4acb30ae 100644
--- a/usr/src/uts/sfmmu/vm/hat_sfmmu.c
+++ b/usr/src/uts/sfmmu/vm/hat_sfmmu.c
@@ -1245,8 +1245,6 @@ hat_lock_init()
 		    NULL);
 }
 
-extern caddr_t kmem64_base, kmem64_end;
-
 #define	SFMMU_KERNEL_MAXVA \
 	(kmem64_base ? (uintptr_t)kmem64_end : (SYSLIMIT))
 
@@ -9961,7 +9959,7 @@ sfmmu_hblk_alloc(sfmmu_t *sfmmup, caddr_t vaddr,
 				 * make sure that we are calculating the
 				 * number of hblk8's that we need correctly.
 				 */
-				panic("no nucleus hblk8 to allocate");
+				prom_panic("no nucleus hblk8 to allocate");
 			}
 			hmeblkp =
 			    (struct hme_blk *)&nucleus_hblk8.list[index];
@@ -9971,12 +9969,12 @@ sfmmu_hblk_alloc(sfmmu_t *sfmmup, caddr_t vaddr,
 			index = nucleus_hblk1.index;
 			if (nucleus_hblk1.index >= nucleus_hblk1.len) {
 				/*
-				 * If we panic here, see startup_modules()
-				 * and H8TOH1; most likely you need to
-				 * update the calculation of the number
-				 * of hblk1's the kernel needs to boot.
+				 * If we panic here, see startup_modules().
+				 * Most likely you need to update the
+				 * calculation of the number of hblk1 elements
+				 * that the kernel needs to boot.
 				 */
-				panic("no nucleus hblk1 to allocate");
+				prom_panic("no nucleus hblk1 to allocate");
 			}
 			hmeblkp =
 			    (struct hme_blk *)&nucleus_hblk1.list[index];
diff --git a/usr/src/uts/sfmmu/vm/hat_sfmmu.h b/usr/src/uts/sfmmu/vm/hat_sfmmu.h
index 0de2623f0e..9f08f93e77 100644
--- a/usr/src/uts/sfmmu/vm/hat_sfmmu.h
+++ b/usr/src/uts/sfmmu/vm/hat_sfmmu.h
@@ -925,7 +925,6 @@ struct hmehash_bucket {
 #define	HME8BLK_SZ	(sizeof (struct hme_blk) + \
 			(NHMENTS - 1) * sizeof (struct sf_hment))
 #define	HME1BLK_SZ	(sizeof (struct hme_blk))
-#define	H8TOH1		(MMU_PAGESIZE4M / MMU_PAGESIZE)
 #define	H1MIN		(2 + MAX_BIGKTSB_TTES)	/* nucleus text+data, ktsb */
 
 /*