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 18/29] Disintegrate asm/system.h for MN10300
Date: Wed, 07 Mar 2012 19:49:15 +0000 [thread overview]
Message-ID: <20120307194915.15987.59544.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <20120307194548.15987.36073.stgit@warthog.procyon.org.uk>
Disintegrate asm/system.h for MN10300.
Signed-off-by: David Howells <dhowells@redhat.com>
---
arch/mn10300/include/asm/barrier.h | 35 ++++++++++++
arch/mn10300/include/asm/exec.h | 16 +++++
arch/mn10300/include/asm/switch_to.h | 49 ++++++++++++++++
arch/mn10300/include/asm/system.h | 102 ----------------------------------
arch/mn10300/kernel/smp-low.S | 1
5 files changed, 101 insertions(+), 102 deletions(-)
create mode 100644 arch/mn10300/include/asm/barrier.h
create mode 100644 arch/mn10300/include/asm/exec.h
create mode 100644 arch/mn10300/include/asm/switch_to.h
delete mode 100644 arch/mn10300/include/asm/system.h
diff --git a/arch/mn10300/include/asm/barrier.h b/arch/mn10300/include/asm/barrier.h
new file mode 100644
index 0000000..9f2e160
--- /dev/null
+++ b/arch/mn10300/include/asm/barrier.h
@@ -0,0 +1,35 @@
+/* MN10300 memory barrier definitions
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+#ifndef _ASM_BARRIER_H
+#define _ASM_BARRIER_H
+
+#define mb() asm volatile ("": : :"memory")
+#define rmb() mb()
+#define wmb() asm volatile ("": : :"memory")
+
+#ifdef CONFIG_SMP
+#define smp_mb() mb()
+#define smp_rmb() rmb()
+#define smp_wmb() wmb()
+#define set_mb(var, value) do { xchg(&var, value); } while (0)
+#else /* CONFIG_SMP */
+#define smp_mb() barrier()
+#define smp_rmb() barrier()
+#define smp_wmb() barrier()
+#define set_mb(var, value) do { var = value; mb(); } while (0)
+#endif /* CONFIG_SMP */
+
+#define set_wmb(var, value) do { var = value; wmb(); } while (0)
+
+#define read_barrier_depends() do {} while (0)
+#define smp_read_barrier_depends() do {} while (0)
+
+#endif /* _ASM_BARRIER_H */
diff --git a/arch/mn10300/include/asm/exec.h b/arch/mn10300/include/asm/exec.h
new file mode 100644
index 0000000..c74e367
--- /dev/null
+++ b/arch/mn10300/include/asm/exec.h
@@ -0,0 +1,16 @@
+/* MN10300 process execution definitions
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+#ifndef _ASM_EXEC_H
+#define _ASM_EXEC_H
+
+#define arch_align_stack(x) (x)
+
+#endif /* _ASM_EXEC_H */
diff --git a/arch/mn10300/include/asm/switch_to.h b/arch/mn10300/include/asm/switch_to.h
new file mode 100644
index 0000000..393d311
--- /dev/null
+++ b/arch/mn10300/include/asm/switch_to.h
@@ -0,0 +1,49 @@
+/* MN10300 task switching definitions
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+#ifndef _ASM_SWITCH_TO_H
+#define _ASM_SWITCH_TO_H
+
+#include <asm/barrier.h>
+
+struct task_struct;
+struct thread_struct;
+
+#if !defined(CONFIG_LAZY_SAVE_FPU)
+struct fpu_state_struct;
+extern asmlinkage void fpu_save(struct fpu_state_struct *);
+#define switch_fpu(prev, next) \
+ do { \
+ if ((prev)->thread.fpu_flags & THREAD_HAS_FPU) { \
+ (prev)->thread.fpu_flags &= ~THREAD_HAS_FPU; \
+ (prev)->thread.uregs->epsw &= ~EPSW_FE; \
+ fpu_save(&(prev)->thread.fpu_state); \
+ } \
+ } while (0)
+#else
+#define switch_fpu(prev, next) do {} while (0)
+#endif
+
+/* context switching is now performed out-of-line in switch_to.S */
+extern asmlinkage
+struct task_struct *__switch_to(struct thread_struct *prev,
+ struct thread_struct *next,
+ struct task_struct *prev_task);
+
+#define switch_to(prev, next, last) \
+do { \
+ switch_fpu(prev, next); \
+ current->thread.wchan = (u_long) __builtin_return_address(0); \
+ (last) = __switch_to(&(prev)->thread, &(next)->thread, (prev)); \
+ mb(); \
+ current->thread.wchan = 0; \
+} while (0)
+
+#endif /* _ASM_SWITCH_TO_H */
diff --git a/arch/mn10300/include/asm/system.h b/arch/mn10300/include/asm/system.h
deleted file mode 100644
index 94b4c5e..0000000
--- a/arch/mn10300/include/asm/system.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* MN10300 System definitions
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_SYSTEM_H
-#define _ASM_SYSTEM_H
-
-#include <asm/cpu-regs.h>
-#include <asm/intctl-regs.h>
-
-#ifdef __KERNEL__
-#ifndef __ASSEMBLY__
-
-#include <linux/kernel.h>
-#include <linux/irqflags.h>
-#include <linux/atomic.h>
-
-#if !defined(CONFIG_LAZY_SAVE_FPU)
-struct fpu_state_struct;
-extern asmlinkage void fpu_save(struct fpu_state_struct *);
-#define switch_fpu(prev, next) \
- do { \
- if ((prev)->thread.fpu_flags & THREAD_HAS_FPU) { \
- (prev)->thread.fpu_flags &= ~THREAD_HAS_FPU; \
- (prev)->thread.uregs->epsw &= ~EPSW_FE; \
- fpu_save(&(prev)->thread.fpu_state); \
- } \
- } while (0)
-#else
-#define switch_fpu(prev, next) do {} while (0)
-#endif
-
-struct task_struct;
-struct thread_struct;
-
-extern asmlinkage
-struct task_struct *__switch_to(struct thread_struct *prev,
- struct thread_struct *next,
- struct task_struct *prev_task);
-
-/* context switching is now performed out-of-line in switch_to.S */
-#define switch_to(prev, next, last) \
-do { \
- switch_fpu(prev, next); \
- current->thread.wchan = (u_long) __builtin_return_address(0); \
- (last) = __switch_to(&(prev)->thread, &(next)->thread, (prev)); \
- mb(); \
- current->thread.wchan = 0; \
-} while (0)
-
-#define arch_align_stack(x) (x)
-
-#define nop() asm volatile ("nop")
-
-/*
- * Force strict CPU ordering.
- * And yes, this is required on UP too when we're talking
- * to devices.
- *
- * For now, "wmb()" doesn't actually do anything, as all
- * Intel CPU's follow what Intel calls a *Processor Order*,
- * in which all writes are seen in the program order even
- * outside the CPU.
- *
- * I expect future Intel CPU's to have a weaker ordering,
- * but I'd also expect them to finally get their act together
- * and add some real memory barriers if so.
- *
- * Some non intel clones support out of order store. wmb() ceases to be a
- * nop for these.
- */
-
-#define mb() asm volatile ("": : :"memory")
-#define rmb() mb()
-#define wmb() asm volatile ("": : :"memory")
-
-#ifdef CONFIG_SMP
-#define smp_mb() mb()
-#define smp_rmb() rmb()
-#define smp_wmb() wmb()
-#define set_mb(var, value) do { xchg(&var, value); } while (0)
-#else /* CONFIG_SMP */
-#define smp_mb() barrier()
-#define smp_rmb() barrier()
-#define smp_wmb() barrier()
-#define set_mb(var, value) do { var = value; mb(); } while (0)
-#endif /* CONFIG_SMP */
-
-#define set_wmb(var, value) do { var = value; wmb(); } while (0)
-
-#define read_barrier_depends() do {} while (0)
-#define smp_read_barrier_depends() do {} while (0)
-
-#endif /* !__ASSEMBLY__ */
-#endif /* __KERNEL__ */
-#endif /* _ASM_SYSTEM_H */
diff --git a/arch/mn10300/kernel/smp-low.S b/arch/mn10300/kernel/smp-low.S
index f1845e9..71f1b2f 100644
--- a/arch/mn10300/kernel/smp-low.S
+++ b/arch/mn10300/kernel/smp-low.S
@@ -15,6 +15,7 @@
#include <asm/smp.h>
#include <asm/thread_info.h>
#include <asm/cpu-regs.h>
+#include <asm/intctl-regs.h>
#include <proc/smp-regs.h>
#include <asm/asm-offsets.h>
#include <asm/frame.inc>
next prev parent reply other threads:[~2012-03-07 19:49 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 ` David Howells [this message]
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 ` [PATCH 23/29] Disintegrate asm/system.h for Score David Howells
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=20120307194915.15987.59544.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®