From 7dd6e73792a35a87c97bc208920b0031510a52f3 Mon Sep 17 00:00:00 2001
From: Varun Sethi <Varun.Sethi@freescale.com>
Date: Mon, 9 Jul 2012 18:34:01 +0530
Subject: [PATCH] --- yaml --- r: 330351 b: refs/heads/master c:
 39be5b4a7f232870aad0b3c130791eacd0d34347 h: refs/heads/master i:   330349:
 a774dfdfa2efe7434eab5b925a1a51fb65c0f0f1   330347:
 558b782ba182a2cd57b6a2268728545f953f3e70   330343:
 662e669d69876f73b337fba14d67eeb77d389645   330335:
 c459cf0eb9340756afa2d10d3219e0560419352c v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/powerpc/kernel/cpu_setup_fsl_booke.S | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3184b43dfc15..06bb2e05b35d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0778407f836d632cce90e5d9df490a7c5e6e398a
+refs/heads/master: 39be5b4a7f232870aad0b3c130791eacd0d34347
diff --git a/trunk/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/trunk/arch/powerpc/kernel/cpu_setup_fsl_booke.S
index 1345e1bc748a..dcd881937f7a 100644
--- a/trunk/arch/powerpc/kernel/cpu_setup_fsl_booke.S
+++ b/trunk/arch/powerpc/kernel/cpu_setup_fsl_booke.S
@@ -143,7 +143,13 @@ _GLOBAL(__setup_cpu_e5500)
 	rlwinm.	r10,r10,0,MMUCFG_LPIDSIZE
 	beq	1f
 	bl	.setup_ehv_ivors
+	b	2f
 1:
+	ld	r10,CPU_SPEC_FEATURES(r4)
+	LOAD_REG_IMMEDIATE(r9,CPU_FTR_EMB_HV)
+	andc	r10,r10,r9
+	std	r10,CPU_SPEC_FEATURES(r4)
+2:
 	mtlr	r5
 	blr
 #endif