From 3091d2feef0d3055ee968e909dc0a40c89db8589 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Thu, 9 Feb 2006 02:54:54 -0800
Subject: [PATCH] --- yaml --- r: 21394 b: refs/heads/master c:
 3a8c069d0eea936c2fe3637ab62967af31555ee9 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/sparc64/kernel/setup.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fb1e1ca4d5d5..c2d88bace3dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d82ace7dc4073b090a55b9740700e32b9a9ae302
+refs/heads/master: 3a8c069d0eea936c2fe3637ab62967af31555ee9
diff --git a/trunk/arch/sparc64/kernel/setup.c b/trunk/arch/sparc64/kernel/setup.c
index 7f02c8f71df6..cec921f6cdbf 100644
--- a/trunk/arch/sparc64/kernel/setup.c
+++ b/trunk/arch/sparc64/kernel/setup.c
@@ -597,7 +597,10 @@ void __init setup_arch(char **cmdline_p)
 	*cmdline_p = prom_getbootargs();
 	strcpy(saved_command_line, *cmdline_p);
 
-	printk("ARCH: SUN4U\n");
+	if (tlb_type == hypervisor)
+		printk("ARCH: SUN4V\n");
+	else
+		printk("ARCH: SUN4U\n");
 
 #ifdef CONFIG_DUMMY_CONSOLE
 	conswitchp = &dummy_con;