From: David Howells <dhowells@redhat.com>
To: paul.gortmaker@windriver.com, hpa@zytor.com
Cc: torvalds@linux-foundation.org, sfr@canb.auug.org.au,
mingo@redhat.com, arnd@arndb.de, dhowells@redhat.com,
tglx@linutronix.de, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org
Subject: [PATCH 23/29] Disintegrate asm/system.h for Score
Date: Wed, 07 Mar 2012 19:50:13 +0000 [thread overview]
Message-ID: <20120307195013.15987.33152.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <20120307194548.15987.36073.stgit@warthog.procyon.org.uk>
Disintegrate asm/system.h for Score. Not compiled.
Signed-off-by: David Howells <dhowells@redhat.com>
---
arch/score/include/asm/atomic.h | 43 +++++++++++++++++
arch/score/include/asm/barrier.h | 16 ++++++
arch/score/include/asm/bug.h | 10 ++++
arch/score/include/asm/exec.h | 6 ++
arch/score/include/asm/switch_to.h | 13 +++++
arch/score/include/asm/system.h | 90 ------------------------------------
6 files changed, 88 insertions(+), 90 deletions(-)
create mode 100644 arch/score/include/asm/barrier.h
create mode 100644 arch/score/include/asm/exec.h
create mode 100644 arch/score/include/asm/switch_to.h
delete mode 100644 arch/score/include/asm/system.h
diff --git a/arch/score/include/asm/atomic.h b/arch/score/include/asm/atomic.h
index 84eb8dd..77b44de 100644
--- a/arch/score/include/asm/atomic.h
+++ b/arch/score/include/asm/atomic.h
@@ -3,4 +3,47 @@
#include <asm-generic/atomic.h>
+struct __xchg_dummy { unsigned long a[100]; };
+#define __xg(x) ((struct __xchg_dummy *)(x))
+
+static inline
+unsigned long __xchg(volatile unsigned long *m, unsigned long val)
+{
+ unsigned long retval;
+ unsigned long flags;
+
+ local_irq_save(flags);
+ retval = *m;
+ *m = val;
+ local_irq_restore(flags);
+ return retval;
+}
+
+#define xchg(ptr, v) \
+ ((__typeof__(*(ptr))) __xchg((unsigned long *)(ptr), \
+ (unsigned long)(v)))
+
+static inline unsigned long __cmpxchg(volatile unsigned long *m,
+ unsigned long old, unsigned long new)
+{
+ unsigned long retval;
+ unsigned long flags;
+
+ local_irq_save(flags);
+ retval = *m;
+ if (retval == old)
+ *m = new;
+ local_irq_restore(flags);
+ return retval;
+}
+
+#define cmpxchg(ptr, o, n) \
+ ((__typeof__(*(ptr))) __cmpxchg((unsigned long *)(ptr), \
+ (unsigned long)(o), \
+ (unsigned long)(n)))
+
+#define __HAVE_ARCH_CMPXCHG 1
+
+#include <asm-generic/cmpxchg-local.h>
+
#endif /* _ASM_SCORE_ATOMIC_H */
diff --git a/arch/score/include/asm/barrier.h b/arch/score/include/asm/barrier.h
new file mode 100644
index 0000000..0eacb64
--- /dev/null
+++ b/arch/score/include/asm/barrier.h
@@ -0,0 +1,16 @@
+#ifndef _ASM_SCORE_BARRIER_H
+#define _ASM_SCORE_BARRIER_H
+
+#define mb() barrier()
+#define rmb() barrier()
+#define wmb() barrier()
+#define smp_mb() barrier()
+#define smp_rmb() barrier()
+#define smp_wmb() barrier()
+
+#define read_barrier_depends() do {} while (0)
+#define smp_read_barrier_depends() do {} while (0)
+
+#define set_mb(var, value) do {var = value; wmb(); } while (0)
+
+#endif /* _ASM_SCORE_BARRIER_H */
diff --git a/arch/score/include/asm/bug.h b/arch/score/include/asm/bug.h
index bb76a33..d1ddaa4 100644
--- a/arch/score/include/asm/bug.h
+++ b/arch/score/include/asm/bug.h
@@ -3,4 +3,14 @@
#include <asm-generic/bug.h>
+extern void __die(const char *, struct pt_regs *, const char *,
+ const char *, unsigned long) __attribute__((noreturn));
+extern void __die_if_kernel(const char *, struct pt_regs *, const char *,
+ const char *, unsigned long);
+
+#define die(msg, regs) \
+ __die(msg, regs, __FILE__ ":", __func__, __LINE__)
+#define die_if_kernel(msg, regs) \
+ __die_if_kernel(msg, regs, __FILE__ ":", __func__, __LINE__)
+
#endif /* _ASM_SCORE_BUG_H */
diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
new file mode 100644
index 0000000..f9f3cd5
--- /dev/null
+++ b/arch/score/include/asm/exec.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_SCORE_EXEC_H
+#define _ASM_SCORE_EXEC_H
+
+extern unsigned long arch_align_stack(unsigned long sp);
+
+#endif /* _ASM_SCORE_EXEC_H */
diff --git a/arch/score/include/asm/switch_to.h b/arch/score/include/asm/switch_to.h
new file mode 100644
index 0000000..031756b
--- /dev/null
+++ b/arch/score/include/asm/switch_to.h
@@ -0,0 +1,13 @@
+#ifndef _ASM_SCORE_SWITCH_TO_H
+#define _ASM_SCORE_SWITCH_TO_H
+
+extern void *resume(void *last, void *next, void *next_ti);
+
+#define switch_to(prev, next, last) \
+do { \
+ (last) = resume(prev, next, task_thread_info(next)); \
+} while (0)
+
+#define finish_arch_switch(prev) do {} while (0)
+
+#endif /* _ASM_SCORE_SWITCH_TO_H */
diff --git a/arch/score/include/asm/system.h b/arch/score/include/asm/system.h
deleted file mode 100644
index 589d5c7..0000000
--- a/arch/score/include/asm/system.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#ifndef _ASM_SCORE_SYSTEM_H
-#define _ASM_SCORE_SYSTEM_H
-
-#include <linux/types.h>
-#include <linux/irqflags.h>
-
-struct pt_regs;
-struct task_struct;
-
-extern void *resume(void *last, void *next, void *next_ti);
-
-#define switch_to(prev, next, last) \
-do { \
- (last) = resume(prev, next, task_thread_info(next)); \
-} while (0)
-
-#define finish_arch_switch(prev) do {} while (0)
-
-typedef void (*vi_handler_t)(void);
-extern unsigned long arch_align_stack(unsigned long sp);
-
-#define mb() barrier()
-#define rmb() barrier()
-#define wmb() barrier()
-#define smp_mb() barrier()
-#define smp_rmb() barrier()
-#define smp_wmb() barrier()
-
-#define read_barrier_depends() do {} while (0)
-#define smp_read_barrier_depends() do {} while (0)
-
-#define set_mb(var, value) do {var = value; wmb(); } while (0)
-
-#define __HAVE_ARCH_CMPXCHG 1
-
-#include <asm-generic/cmpxchg-local.h>
-
-#ifndef __ASSEMBLY__
-
-struct __xchg_dummy { unsigned long a[100]; };
-#define __xg(x) ((struct __xchg_dummy *)(x))
-
-static inline
-unsigned long __xchg(volatile unsigned long *m, unsigned long val)
-{
- unsigned long retval;
- unsigned long flags;
-
- local_irq_save(flags);
- retval = *m;
- *m = val;
- local_irq_restore(flags);
- return retval;
-}
-
-#define xchg(ptr, v) \
- ((__typeof__(*(ptr))) __xchg((unsigned long *)(ptr), \
- (unsigned long)(v)))
-
-static inline unsigned long __cmpxchg(volatile unsigned long *m,
- unsigned long old, unsigned long new)
-{
- unsigned long retval;
- unsigned long flags;
-
- local_irq_save(flags);
- retval = *m;
- if (retval == old)
- *m = new;
- local_irq_restore(flags);
- return retval;
-}
-
-#define cmpxchg(ptr, o, n) \
- ((__typeof__(*(ptr))) __cmpxchg((unsigned long *)(ptr), \
- (unsigned long)(o), \
- (unsigned long)(n)))
-
-extern void __die(const char *, struct pt_regs *, const char *,
- const char *, unsigned long) __attribute__((noreturn));
-extern void __die_if_kernel(const char *, struct pt_regs *, const char *,
- const char *, unsigned long);
-
-#define die(msg, regs) \
- __die(msg, regs, __FILE__ ":", __func__, __LINE__)
-#define die_if_kernel(msg, regs) \
- __die_if_kernel(msg, regs, __FILE__ ":", __func__, __LINE__)
-
-#endif /* !__ASSEMBLY__ */
-#endif /* _ASM_SCORE_SYSTEM_H */
next prev parent reply other threads:[~2012-03-07 19:50 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-07 19:45 [RFC][PATCH 00/29] Disintegrate and kill asm/system.h David Howells
2012-03-07 19:46 ` [PATCH 01/29] Move all declarations of free_initmem() to linux/mm.h David Howells
2012-03-07 19:46 ` [PATCH 02/29] Remove all #inclusions of asm/system.h David Howells
2012-03-07 19:46 ` [PATCH 03/29] Disintegrate asm/system.h on all arches David Howells
2012-03-07 19:46 ` [PATCH 04/29] " David Howells
2012-03-07 21:47 ` Arnd Bergmann
2012-03-07 19:46 ` [PATCH 05/29] Disintegrate asm/system.h for ARM David Howells
2012-03-07 19:47 ` [PATCH 06/29] Disintegrate asm/system.h for AVR32 David Howells
2012-03-07 19:47 ` [PATCH 07/29] Disintegrate asm/system.h for Blackfin David Howells
2012-03-07 19:47 ` [PATCH 08/29] Disintegrate asm/system.h for C6X David Howells
2012-03-07 21:28 ` Mark Salter
2012-03-07 21:36 ` David Howells
2012-03-07 21:43 ` Mark Salter
2012-03-07 21:44 ` Mark Salter
2012-03-07 22:42 ` David Howells
2012-03-07 22:52 ` Mark Salter
2012-03-07 19:47 ` [PATCH 09/29] Disintegrate asm/system.h for CRIS David Howells
2012-03-09 12:56 ` Jesper Nilsson
2012-03-07 19:47 ` [PATCH 10/29] Disintegrate asm/system.h for FRV David Howells
2012-03-07 19:47 ` [PATCH 11/29] Disintegrate asm/system.h for H8300 David Howells
2012-03-07 19:48 ` [PATCH 12/29] Disintegrate asm/system.h for Hexagon David Howells
2012-03-07 19:48 ` [PATCH 13/29] Disintegrate asm/system.h for IA64 David Howells
2012-03-07 19:48 ` [PATCH 14/29] Disintegrate asm/system.h for M32R David Howells
2012-03-07 19:48 ` [PATCH 15/29] Disintegrate asm/system.h for M68K David Howells
2012-03-07 19:48 ` [PATCH 16/29] Disintegrate asm/system.h for Microblaze David Howells
2012-03-07 19:49 ` [PATCH 17/29] Disintegrate asm/system.h for MIPS David Howells
2012-03-07 19:49 ` [PATCH 18/29] Disintegrate asm/system.h for MN10300 David Howells
2012-03-07 19:49 ` [PATCH 19/29] Disintegrate asm/system.h for OpenRISC David Howells
2012-03-07 19:49 ` [PATCH 20/29] Disintegrate asm/system.h for PA-RISC David Howells
2012-03-07 19:49 ` [PATCH 21/29] Disintegrate asm/system.h for PowerPC David Howells
2012-03-12 20:38 ` Benjamin Herrenschmidt
2012-03-07 19:50 ` [PATCH 22/29] Disintegrate asm/system.h for S390 David Howells
2012-03-08 11:18 ` Martin Schwidefsky
2012-03-12 23:40 ` David Howells
2012-03-07 19:50 ` David Howells [this message]
2012-03-07 19:50 ` [PATCH 24/29] Disintegrate asm/system.h for SH David Howells
2012-03-07 19:50 ` [PATCH 25/29] Disintegrate asm/system.h for Sparc David Howells
2012-03-07 19:50 ` [PATCH 26/29] Disintegrate asm/system.h for Tile David Howells
2012-03-09 21:14 ` Chris Metcalf
2012-03-07 19:50 ` [PATCH 27/29] Disintegrate asm/system.h for Unicore32 David Howells
2012-03-07 19:51 ` [PATCH 28/29] Disintegrate asm/system.h for X86 David Howells
2012-03-07 19:51 ` [PATCH 29/29] Disintegrate asm/system.h for Xtensa David Howells
2012-03-07 21:46 ` [RFC][PATCH 00/29] Disintegrate and kill asm/system.h Arnd Bergmann
2012-03-07 22:40 ` David Howells
2012-03-07 22:59 ` Arnd Bergmann
2012-03-08 18:43 ` Paul Gortmaker
2012-03-08 21:51 ` David Howells
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=20120307195013.15987.33152.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=arnd@arndb.de \
--cc=hpa@zytor.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=paul.gortmaker@windriver.com \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®