diff options
| author | David Howells <dhowells@redhat.com> | 2006-02-14 22:53:18 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-15 01:09:35 +0100 |
| commit | 68f624fc8b9fa50de9cc0ebd612ef7b7b9fa32d0 (patch) | |
| tree | 2e25482dd6a482ccf1378d2b01b863f99603bab5 /include/asm-frv/atomic.h | |
| parent | [PATCH] hrtimer: round up relative start time on low-res arches (diff) | |
| download | linux-68f624fc8b9fa50de9cc0ebd612ef7b7b9fa32d0.tar.xz linux-68f624fc8b9fa50de9cc0ebd612ef7b7b9fa32d0.zip | |
[PATCH] FRV: Miscellaneous fixes
Make various alterations and fixes to the FRV arch:
(1) Resyncs the FRV system call collection with the i386 arch.
(2) Discards __iounmap() as it's not used.
(3) Fixes the use of the SWAP/SWAPI instruction to get the arguments the right
way around in atomic.h, and also to get the asm constraints correct.
(4) Moves copy_to/from_user_page() to asm/cacheflush.h to be consistent with
other archs.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-frv/atomic.h')
| -rw-r--r-- | include/asm-frv/atomic.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-frv/atomic.h b/include/asm-frv/atomic.h index a59f684b4f33..5d9f84bfdcad 100644 --- a/include/asm-frv/atomic.h +++ b/include/asm-frv/atomic.h @@ -220,9 +220,9 @@ extern unsigned long atomic_test_and_XOR_mask(unsigned long mask, volatile unsig switch (sizeof(__xg_orig)) { \ case 4: \ asm volatile( \ - "swap%I0 %2,%M0" \ - : "+m"(*__xg_ptr), "=&r"(__xg_orig) \ - : "r"(x) \ + "swap%I0 %M0,%1" \ + : "+m"(*__xg_ptr), "=r"(__xg_orig) \ + : "1"(x) \ : "memory" \ ); \ break; \ |