From 3bb37461ea03ae2d5f3c995cba63362f09dd8b44 Mon Sep 17 00:00:00 2001
From: Li Zhong <zhong@linux.vnet.ibm.com>
Date: Mon, 13 May 2013 16:16:44 +0000
Subject: [PATCH] --- yaml --- r: 375571 b: refs/heads/master c:
 a1797b2fd2051515689fd54a9db8fd20ebd5e5f7 h: refs/heads/master i:   375569:
 f07f4bd03dd7f57e0250715150d69dd7133203e4   375567:
 a18e51633acd5892b8db7d35b6e39dbd99b89acc v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/powerpc/platforms/pseries/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 402d321f5533..1d27274b102a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d1c57451154047ab31aadfbc712bb8aa174bfb3
+refs/heads/master: a1797b2fd2051515689fd54a9db8fd20ebd5e5f7
diff --git a/trunk/arch/powerpc/platforms/pseries/Kconfig b/trunk/arch/powerpc/platforms/pseries/Kconfig
index 9a0941bc4d31..023b288f895b 100644
--- a/trunk/arch/powerpc/platforms/pseries/Kconfig
+++ b/trunk/arch/powerpc/platforms/pseries/Kconfig
@@ -18,6 +18,7 @@ config PPC_PSERIES
 	select PPC_PCI_CHOICE if EXPERT
 	select ZLIB_DEFLATE
 	select PPC_DOORBELL
+	select HAVE_CONTEXT_TRACKING
 	default y
 
 config PPC_SPLPAR