diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /include/asm-mips/system.h | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'include/asm-mips/system.h')
| -rw-r--r-- | include/asm-mips/system.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h index c16163a32..49f5f2aad 100644 --- a/include/asm-mips/system.h +++ b/include/asm-mips/system.h @@ -1,4 +1,4 @@ -/* $Id: system.h,v 1.8 1998/07/20 17:52:21 ralf Exp $ +/* $Id: system.h,v 1.7 1998/08/25 09:22:03 ralf Exp $ * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -107,6 +107,9 @@ __restore_flags(int flags) #define save_and_cli(x) __save_and_cli(x) #define restore_flags(x) __restore_flags(x) +/* + * These are probably defined overly paranoid ... + */ #define mb() \ __asm__ __volatile__( \ "# prevent instructions being moved around\n\t" \ @@ -117,6 +120,8 @@ __asm__ __volatile__( \ : /* no output */ \ : /* no input */ \ : "memory") +#define rmb() mb() +#define wmb() mb() #if !defined (_LANGUAGE_ASSEMBLY) /* |