[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20101129082626.5991.46757.sendpatchset@localhost.localdomain>
Date: Mon, 29 Nov 2010 03:21:28 -0500
From: Amerigo Wang <amwang@...hat.com>
To: linux-kernel@...r.kernel.org
Cc: Andreas Dilger <adilger@...ger.ca>,
David Howells <dhowells@...hat.com>,
Richard Henderson <rth@...ddle.net>,
KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>,
Amerigo Wang <amwang@...hat.com>,
Ralf Baechle <ralf@...ux-mips.org>,
Michal Simek <monstr@...str.eu>,
Martin Schwidefsky <schwidefsky@...ibm.com>,
Chen Liqin <liqin.chen@...plusct.com>
Subject: [Patch] frv: do some cleanups
1. frv doesn't support SMP, remove the unless SMP bits.
2. frv has its own alloc_task_struct, so define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
(I am not sure if frv should use generic alloc_task_struct().)
Signed-off-by: WANG Cong <amwang@...hat.com>
---
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index f6bcb03..ab0a983 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -364,7 +364,6 @@ menu "Power management options"
config ARCH_SUSPEND_POSSIBLE
def_bool y
- depends on !SMP
source kernel/power/Kconfig
endmenu
diff --git a/arch/frv/include/asm/system.h b/arch/frv/include/asm/system.h
index 0a6d8d9..6c10fd2 100644
--- a/arch/frv/include/asm/system.h
+++ b/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/arch/frv/include/asm/thread_info.h b/arch/frv/include/asm/thread_info.h
index 11f33ea..d5c1a0a 100644
--- a/arch/frv/include/asm/thread_info.h
+++ b/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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists