From 64dfdffddb0c0a04646c693521d6f05ff32865e2 Mon Sep 17 00:00:00 2001
From: Michael Neuling <mikey@neuling.org>
Date: Wed, 13 Feb 2013 16:21:43 +0000
Subject: [PATCH] --- yaml --- r: 356433 b: refs/heads/master c:
 3d72bbc40777437a78db70e398981c828240c81f h: refs/heads/master i:   356431:
 d23d5f47c06c220aa57d90ce268269da443d1561 v: v3

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

diff --git a/[refs] b/[refs]
index 45f2cbe852e8..51f25b23616f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9eaee5a8ac18dcfebf6bb295b6eced1d934be51
+refs/heads/master: 3d72bbc40777437a78db70e398981c828240c81f
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
index 4b27edbdb799..85ff3a080360 100644
--- a/trunk/arch/powerpc/Kconfig
+++ b/trunk/arch/powerpc/Kconfig
@@ -313,6 +313,14 @@ config MATH_EMULATION
 	  unit, which will allow programs that use floating-point
 	  instructions to run.
 
+config PPC_TRANSACTIONAL_MEM
+       bool "Transactional Memory support for POWERPC"
+       depends on PPC_BOOK3S_64
+       depends on SMP
+       default n
+       ---help---
+         Support user-mode Transactional Memory on POWERPC.
+
 config 8XX_MINIMAL_FPEMU
 	bool "Minimal math emulation for 8xx"
 	depends on 8xx && !MATH_EMULATION