From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>,
clameter@sgi.com, lethal@linux-sh.org
Subject: [patch 23/28] Add cmpxchg_local to sh, use generic cmpxchg() instead of cmpxchg_u32
Date: Wed, 31 Oct 2007 18:37:33 -0400 [thread overview]
Message-ID: <20071031224217.736301231@polymtl.ca> (raw)
In-Reply-To: 20071031223710.099558229@polymtl.ca
[-- Attachment #1: add-cmpxchg-local-to-sh.patch --]
[-- Type: text/plain, Size: 2785 bytes --]
Use the new generic cmpxchg_local (disables interrupt). Also use the generic
cmpxchg as fallback if SMP is not set.
Since cmpxchg_u32 is _exactly_ the cmpxchg_local generic implementation, remove
it and use the generic version instead.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: clameter@sgi.com
CC: lethal@linux-sh.org
---
include/asm-sh/system.h | 52 ++++++++++++------------------------------------
1 file changed, 14 insertions(+), 38 deletions(-)
Index: linux-2.6-lttng/include/asm-sh/system.h
===================================================================
--- linux-2.6-lttng.orig/include/asm-sh/system.h 2007-10-31 17:32:43.000000000 -0400
+++ linux-2.6-lttng/include/asm-sh/system.h 2007-10-31 18:27:24.000000000 -0400
@@ -199,47 +199,23 @@ extern void __xchg_called_with_bad_point
__xchg__res; \
})
-#define xchg(ptr,x) \
- ((__typeof__(*(ptr)))__xchg((ptr),(unsigned long)(x), sizeof(*(ptr))))
+#define xchg(ptr, x) \
+ ((__typeof__(*(ptr)))__xchg((ptr), (unsigned long)(x), sizeof(*(ptr))))
-static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old,
- unsigned long new)
-{
- __u32 retval;
- unsigned long flags;
-
- local_irq_save(flags);
- retval = *m;
- if (retval == old)
- *m = new;
- local_irq_restore(flags); /* implies memory barrier */
- return retval;
-}
-
-/* This function doesn't exist, so you'll get a linker error
- * if something tries to do an invalid cmpxchg(). */
-extern void __cmpxchg_called_with_bad_pointer(void);
-
-#define __HAVE_ARCH_CMPXCHG 1
+#include <asm-generic/cmpxchg-local.h>
-static inline unsigned long __cmpxchg(volatile void * ptr, unsigned long old,
- unsigned long new, int size)
-{
- switch (size) {
- case 4:
- return __cmpxchg_u32(ptr, old, new);
- }
- __cmpxchg_called_with_bad_pointer();
- return old;
-}
+/*
+ * cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make
+ * them available.
+ */
+#define cmpxchg_local(ptr, o, n) \
+ ((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\
+ (unsigned long)(n), sizeof(*(ptr))))
+#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
-#define cmpxchg(ptr,o,n) \
- ({ \
- __typeof__(*(ptr)) _o_ = (o); \
- __typeof__(*(ptr)) _n_ = (n); \
- (__typeof__(*(ptr))) __cmpxchg((ptr), (unsigned long)_o_, \
- (unsigned long)_n_, sizeof(*(ptr))); \
- })
+#ifndef CONFIG_SMP
+#include <asm-generic/cmpxchg.h>
+#endif
extern void die(const char *str, struct pt_regs *regs, long err) __attribute__ ((noreturn));
--
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
next prev parent reply other threads:[~2007-10-31 22:47 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-31 22:37 [patch 00/28] cmpxchg_local and cmpxchg64_local patches, cleaned up Mathieu Desnoyers
2007-10-31 22:37 ` [patch 01/28] Add cmpxchg_local to asm-generic for per cpu atomic operations Mathieu Desnoyers
2007-10-31 22:37 ` [patch 02/28] Fall back on interrupt disable in cmpxchg8b on 80386 and 80486 Mathieu Desnoyers
2007-10-31 22:37 ` [patch 03/28] Add cmpxchg64 and cmpxchg64_local to alpha Mathieu Desnoyers
2007-10-31 22:37 ` [patch 04/28] Add cmpxchg64 and cmpxchg64_local to mips Mathieu Desnoyers
2007-10-31 22:37 ` [patch 05/28] Add cmpxchg64 and cmpxchg64_local to powerpc Mathieu Desnoyers
2007-10-31 22:37 ` [patch 06/28] Add cmpxchg64 and cmpxchg64_local to x86_64 Mathieu Desnoyers
2007-10-31 22:37 ` [patch 07/28] Add cmpxchg_local to arm Mathieu Desnoyers
2007-10-31 22:37 ` [patch 08/28] Add cmpxchg_local to avr32 Mathieu Desnoyers
2007-10-31 22:37 ` [patch 09/28] Add cmpxchg_local to blackfin, replace __cmpxchg by generic cmpxchg Mathieu Desnoyers
2007-10-31 22:37 ` [patch 10/28] Add cmpxchg_local to cris Mathieu Desnoyers
2007-10-31 22:37 ` [patch 11/28] Add cmpxchg_local to frv Mathieu Desnoyers
2007-10-31 22:37 ` [patch 12/28] Add cmpxchg_local to h8300 Mathieu Desnoyers
2007-10-31 22:37 ` [patch 13/28] Add cmpxchg_local, cmpxchg64 and cmpxchg64_local to ia64 Mathieu Desnoyers
2007-10-31 22:37 ` [patch 14/28] New cmpxchg_local (optimized for UP case) for m32r Mathieu Desnoyers
2007-10-31 22:37 ` [patch 15/28] Fix m32r __xchg Mathieu Desnoyers
2007-10-31 22:37 ` [patch 16/28] m32r: build fix of arch/m32r/kernel/smpboot.c Mathieu Desnoyers
2007-10-31 22:37 ` [patch 17/28] local_t m32r use architecture specific cmpxchg_local Mathieu Desnoyers
2007-10-31 22:37 ` [patch 18/28] Add cmpxchg_local to m86k Mathieu Desnoyers
2007-10-31 22:37 ` [patch 19/28] Add cmpxchg_local to m68knommu Mathieu Desnoyers
2007-10-31 22:37 ` [patch 20/28] Add cmpxchg_local to parisc Mathieu Desnoyers
2007-10-31 22:37 ` [patch 21/28] Add cmpxchg_local to ppc Mathieu Desnoyers
2007-10-31 22:37 ` [patch 22/28] Add cmpxchg_local to s390 Mathieu Desnoyers
2007-10-31 22:37 ` Mathieu Desnoyers [this message]
2007-10-31 22:37 ` [patch 24/28] Add cmpxchg_local to sh64 Mathieu Desnoyers
2007-10-31 22:37 ` [patch 25/28] Add cmpxchg_local to sparc, move __cmpxchg to system.h Mathieu Desnoyers
2007-10-31 22:37 ` [patch 26/28] Add cmpxchg_local to sparc64 Mathieu Desnoyers
2007-10-31 22:37 ` [patch 27/28] Add cmpxchg_local to v850 Mathieu Desnoyers
2007-10-31 22:37 ` [patch 28/28] Add cmpxchg_local to xtensa Mathieu Desnoyers
-- strict thread matches above, loose matches on Subject: below --
2007-10-30 19:15 [patch 00/28] cmpxchg_local standardization across architectures Mathieu Desnoyers
2007-10-30 19:16 ` [patch 23/28] Add cmpxchg_local to sh, use generic cmpxchg() instead of cmpxchg_u32 Mathieu Desnoyers
2007-08-27 15:52 [patch 00/28] Add cmpxchg64_local and cmpxchg_local to each architecture Mathieu Desnoyers
2007-08-27 15:52 ` [patch 23/28] Add cmpxchg_local to sh, use generic cmpxchg() instead of cmpxchg_u32 Mathieu Desnoyers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071031224217.736301231@polymtl.ca \
--to=mathieu.desnoyers@polymtl.ca \
--cc=akpm@linux-foundation.org \
--cc=clameter@sgi.com \
--cc=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox