From: David Howells <dhowells@redhat.com>
To: paul.gortmaker@windriver.com
Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
arnd@arndb.de, David Howells <dhowells@redhat.com>,
Chen Liqin <liqin.chen@sunplusct.com>
Subject: [PATCH 23/38] Disintegrate asm/system.h for Score [ver #3]
Date: Thu, 15 Mar 2012 20:58:51 +0000 [thread overview]
Message-ID: <20120315205851.28759.10554.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <20120315205514.28759.58969.stgit@warthog.procyon.org.uk>
Disintegrate asm/system.h for Score. Not compiled.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Chen Liqin <liqin.chen@sunplusct.com>
---
arch/score/include/asm/atomic.h | 1
arch/score/include/asm/barrier.h | 16 ++++++
arch/score/include/asm/bitops.h | 1
arch/score/include/asm/bug.h | 11 ++++
arch/score/include/asm/cmpxchg.h | 49 +++++++++++++++++++
arch/score/include/asm/exec.h | 6 ++
arch/score/include/asm/switch_to.h | 13 +++++
arch/score/include/asm/system.h | 95 ++----------------------------------
8 files changed, 101 insertions(+), 91 deletions(-)
create mode 100644 arch/score/include/asm/barrier.h
create mode 100644 arch/score/include/asm/cmpxchg.h
create mode 100644 arch/score/include/asm/exec.h
create mode 100644 arch/score/include/asm/switch_to.h
diff --git a/arch/score/include/asm/atomic.h b/arch/score/include/asm/atomic.h
index 84eb8dd..edf33db 100644
--- a/arch/score/include/asm/atomic.h
+++ b/arch/score/include/asm/atomic.h
@@ -1,6 +1,7 @@
#ifndef _ASM_SCORE_ATOMIC_H
#define _ASM_SCORE_ATOMIC_H
+#include <asm/cmpxchg.h>
#include <asm-generic/atomic.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/bitops.h b/arch/score/include/asm/bitops.h
index 2763b05..a304096 100644
--- a/arch/score/include/asm/bitops.h
+++ b/arch/score/include/asm/bitops.h
@@ -2,7 +2,6 @@
#define _ASM_SCORE_BITOPS_H
#include <asm/byteorder.h> /* swab32 */
-#include <asm/system.h> /* save_flags */
/*
* clear_bit() doesn't provide any barrier for the compiler.
diff --git a/arch/score/include/asm/bug.h b/arch/score/include/asm/bug.h
index bb76a33..fd7164a 100644
--- a/arch/score/include/asm/bug.h
+++ b/arch/score/include/asm/bug.h
@@ -3,4 +3,15 @@
#include <asm-generic/bug.h>
+struct pt_regs;
+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/cmpxchg.h b/arch/score/include/asm/cmpxchg.h
new file mode 100644
index 0000000..f384839
--- /dev/null
+++ b/arch/score/include/asm/cmpxchg.h
@@ -0,0 +1,49 @@
+#ifndef _ASM_SCORE_CMPXCHG_H
+#define _ASM_SCORE_CMPXCHG_H
+
+#include <linux/irqflags.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_CMPXCHG_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
index 589d5c7..a7f4057 100644
--- a/arch/score/include/asm/system.h
+++ b/arch/score/include/asm/system.h
@@ -1,90 +1,5 @@
-#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 */
+/* FILE TO BE DELETED. DO NOT ADD STUFF HERE! */
+#include <asm/barrier.h>
+#include <asm/cmpxchg.h>
+#include <asm/exec.h>
+#include <asm/switch_to.h>
next prev parent reply other threads:[~2012-03-15 20:59 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-15 20:55 [RFC][PATCH 00/38] Disintegrate and kill asm/system.h [ver #3] David Howells
2012-03-15 20:55 ` [PATCH 01/38] ARM: Fix missing linux/types.h #inclusion in asm/hardware/iop3xx.h " David Howells
2012-03-15 20:55 ` [PATCH 02/38] Disintegrate asm/system.h for X86 " David Howells
2012-03-15 20:55 ` [PATCH 03/38] Disintegrate asm/system.h for Alpha " David Howells
2012-03-15 20:55 ` David Howells
2012-03-15 20:55 ` [PATCH 04/38] ARM: move CP15 definitions to separate header file " David Howells
2012-03-15 20:55 ` David Howells
2012-03-15 20:56 ` [PATCH 05/38] Disintegrate asm/system.h for ARM " David Howells
2012-03-15 20:56 ` David Howells
2012-03-16 14:40 ` Mark Salter
2012-03-19 10:45 ` David Howells
2012-03-15 20:56 ` [PATCH 06/38] Disintegrate asm/system.h for AVR32 " David Howells
2012-03-15 20:56 ` [PATCH 07/38] Disintegrate asm/system.h for Blackfin " David Howells
2012-03-15 20:56 ` David Howells
2012-03-15 23:02 ` Mike Frysinger
2012-03-16 3:06 ` Bob Liu
2012-03-15 20:56 ` [PATCH 08/38] Fix c6x's entry.S " David Howells
2012-03-15 20:56 ` [PATCH 09/38] Disintegrate asm/system.h for C6X " David Howells
2012-03-16 15:29 ` Mark Salter
2012-03-15 20:56 ` [PATCH 10/38] Disintegrate asm/system.h for CRIS " David Howells
2012-03-15 20:56 ` David Howells
2012-03-15 20:56 ` [PATCH 11/38] Disintegrate asm/system.h for FRV " David Howells
2012-03-15 20:56 ` David Howells
2012-03-15 20:57 ` [PATCH 12/38] Disintegrate asm/system.h for H8300 " David Howells
2012-03-15 20:57 ` David Howells
2012-03-15 20:57 ` [PATCH 13/38] Disintegrate asm/system.h for Hexagon " David Howells
2012-03-15 20:57 ` David Howells
2012-03-15 20:57 ` [PATCH 14/38] Disintegrate asm/system.h for IA64 " David Howells
2012-03-15 20:57 ` David Howells
2012-03-15 20:57 ` [PATCH 15/38] Disintegrate asm/system.h for M32R " David Howells
2012-03-15 20:57 ` [PATCH 16/38] Disintegrate asm/system.h for M68K " David Howells
2012-03-15 20:57 ` [PATCH 17/38] Disintegrate asm/system.h for Microblaze " David Howells
2012-03-15 20:57 ` David Howells
[not found] ` <20120315205754.28759.56543.stgit-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org>
2012-03-30 9:58 ` [microblaze-linux] " Michal Simek
2012-03-15 20:58 ` [PATCH 18/38] Disintegrate asm/system.h for MIPS " David Howells
2012-03-15 20:58 ` David Howells
2012-03-15 20:58 ` [PATCH 19/38] Disintegrate asm/system.h for MN10300 " David Howells
2012-03-15 20:58 ` David Howells
2012-03-15 20:58 ` [PATCH 20/38] Disintegrate asm/system.h for PA-RISC " David Howells
2012-03-15 20:58 ` [PATCH 21/38] Disintegrate asm/system.h for PowerPC " David Howells
2012-03-15 22:11 ` Stephen Rothwell
2012-03-15 20:58 ` [PATCH 22/38] Disintegrate asm/system.h for S390 " David Howells
2012-03-15 20:58 ` David Howells
2012-03-15 20:58 ` David Howells [this message]
2012-03-15 20:58 ` [PATCH 24/38] Disintegrate asm/system.h for SH " David Howells
2012-03-15 20:58 ` David Howells
2012-03-15 20:59 ` [PATCH 25/38] Disintegrate asm/system.h for Sparc " David Howells
2012-03-15 20:59 ` David Howells
2012-03-15 20:59 ` [PATCH 26/38] Disintegrate asm/system.h for Tile " David Howells
2012-03-15 20:59 ` David Howells
2012-03-15 20:59 ` [PATCH 27/38] Disintegrate asm/system.h for Unicore32 " David Howells
2012-03-16 3:20 ` Guan Xuetao
2012-03-16 9:10 ` David Howells
2012-03-19 8:50 ` Guan Xueao
2012-03-20 10:15 ` David Howells
2012-03-21 1:40 ` Guan Xuetao
2012-03-16 14:28 ` David Howells
2012-03-16 14:28 ` David Howells
2012-03-19 8:59 ` Guan Xueao
2012-03-19 11:18 ` David Howells
2012-03-19 11:18 ` David Howells
2012-03-20 3:01 ` [PATCH] Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt] Guan Xuetao
2012-03-20 3:10 ` [PATCH 27/38] Disintegrate asm/system.h for Unicore32 [ver #3] Guan Xuetao
2012-03-20 9:33 ` [PATCH] Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt] David Howells
2012-03-21 1:33 ` Guan Xuetao
2012-03-15 20:59 ` [PATCH 28/38] Disintegrate asm/system.h for Xtensa [ver #3] David Howells
2012-03-15 20:59 ` [PATCH 29/38] Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h " David Howells
2012-03-15 20:59 ` [PATCH 30/38] Create asm-generic/barrier.h " David Howells
2012-03-15 21:00 ` [PATCH 31/38] Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h " David Howells
2012-03-15 21:00 ` David Howells
2012-03-15 21:00 ` [PATCH 32/38] Split the switch_to() wrapper out of asm-generic/system.h " David Howells
2012-03-15 21:00 ` David Howells
2012-03-15 21:00 ` [PATCH 33/38] Split arch_align_stack() out from " David Howells
2012-03-15 21:00 ` [PATCH 34/38] Disintegrate asm/system.h for OpenRISC " David Howells
2012-03-15 21:00 ` David Howells
2012-03-15 21:00 ` [PATCH 35/38] Move all declarations of free_initmem() to linux/mm.h " David Howells
2012-03-15 21:00 ` David Howells
2012-03-15 21:00 ` [PATCH 36/38] Add #includes needed to permit the removal of asm/system.h " David Howells
2012-03-15 21:00 ` David Howells
2012-03-15 21:00 ` [PATCH 37/38] Remove all #inclusions " David Howells
2012-03-15 21:01 ` [PATCH 38/38] Delete all instances " 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=20120315205851.28759.10554.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=arnd@arndb.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liqin.chen@sunplusct.com \
--cc=paul.gortmaker@windriver.com \
/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;
as well as URLs for NNTP newsgroup(s).