From 52aa930490b88ebf02b22545140f525d8f6e2cc9 Mon Sep 17 00:00:00 2001
From: Amerigo Wang <amwang@redhat.com>
Date: Tue, 29 Mar 2011 14:05:12 +0100
Subject: [PATCH] --- yaml --- r: 243395 b: refs/heads/master c:
 5ca7202bc4db3e2fd5653c52a608601c7a64a2ac h: refs/heads/master i:   243393:
 6006c69a5b003607c7d6a6367b93a0c3835309b1   243391:
 f50f473ae6915a4367b33059c463f41cae85ead7 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/frv/Kconfig                   | 1 -
 trunk/arch/frv/include/asm/system.h      | 9 ---------
 trunk/arch/frv/include/asm/thread_info.h | 2 ++
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 0b609f0f1a6f..ce1bc20655dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ef9bdde9cd8e7f9d43a975b47f520ca64cbd0a1
+refs/heads/master: 5ca7202bc4db3e2fd5653c52a608601c7a64a2ac
diff --git a/trunk/arch/frv/Kconfig b/trunk/arch/frv/Kconfig
index f6037b2da25e..968a33027831 100644
--- a/trunk/arch/frv/Kconfig
+++ b/trunk/arch/frv/Kconfig
@@ -361,7 +361,6 @@ menu "Power management options"
 
 config ARCH_SUSPEND_POSSIBLE
 	def_bool y
-	depends on !SMP
 
 source kernel/power/Kconfig
 endmenu
diff --git a/trunk/arch/frv/include/asm/system.h b/trunk/arch/frv/include/asm/system.h
index 0a6d8d9ca45b..6c10fd2c626d 100644
--- a/trunk/arch/frv/include/asm/system.h
+++ b/trunk/arch/frv/include/asm/system.h
@@ -45,21 +45,12 @@ do {									\
 #define wmb()			asm volatile ("membar" : : :"memory")
 #define read_barrier_depends()	do { } while (0)
 
-#ifdef CONFIG_SMP
-#define smp_mb()			mb()
-#define smp_rmb()			rmb()
-#define smp_wmb()			wmb()
-#define smp_read_barrier_depends()	read_barrier_depends()
-#define set_mb(var, value) \
-	do { xchg(&var, (value)); } while (0)
-#else
 #define smp_mb()			barrier()
 #define smp_rmb()			barrier()
 #define smp_wmb()			barrier()
 #define smp_read_barrier_depends()	do {} while(0)
 #define set_mb(var, value) \
 	do { var = (value); barrier(); } while (0)
-#endif
 
 extern void die_if_kernel(const char *, ...) __attribute__((format(printf, 1, 2)));
 extern void free_initmem(void);
diff --git a/trunk/arch/frv/include/asm/thread_info.h b/trunk/arch/frv/include/asm/thread_info.h
index 08179f310f20..cefbe73dc119 100644
--- a/trunk/arch/frv/include/asm/thread_info.h
+++ b/trunk/arch/frv/include/asm/thread_info.h
@@ -21,6 +21,8 @@
 
 #define THREAD_SIZE		8192
 
+#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
+
 /*
  * low level task data that entry.S needs immediate access to
  * - this struct should fit entirely inside of one cache line