diff options
author | David Howells <dhowells@redhat.com> | 2006-02-14 16:53:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-14 19:09:35 -0500 |
commit | 68f624fc8b9fa50de9cc0ebd612ef7b7b9fa32d0 (patch) | |
tree | 2e25482dd6a482ccf1378d2b01b863f99603bab5 /arch | |
parent | 06027bdd278a32a84b273e41db68a5db8ffd2bb6 (diff) |
[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 'arch')
-rw-r--r-- | arch/frv/kernel/entry.S | 26 | ||||
-rw-r--r-- | arch/frv/mm/kmap.c | 9 |
2 files changed, 21 insertions, 14 deletions
diff --git a/arch/frv/kernel/entry.S b/arch/frv/kernel/entry.S index 5f6548388b74..c69d499d28cf 100644 --- a/arch/frv/kernel/entry.S +++ b/arch/frv/kernel/entry.S | |||
@@ -1418,11 +1418,27 @@ sys_call_table: | |||
1418 | .long sys_add_key | 1418 | .long sys_add_key |
1419 | .long sys_request_key | 1419 | .long sys_request_key |
1420 | .long sys_keyctl | 1420 | .long sys_keyctl |
1421 | .long sys_ni_syscall // sys_vperfctr_open | 1421 | .long sys_ioprio_set |
1422 | .long sys_ni_syscall // sys_vperfctr_control /* 290 */ | 1422 | .long sys_ioprio_get /* 290 */ |
1423 | .long sys_ni_syscall // sys_vperfctr_unlink | 1423 | .long sys_inotify_init |
1424 | .long sys_ni_syscall // sys_vperfctr_iresume | 1424 | .long sys_inotify_add_watch |
1425 | .long sys_ni_syscall // sys_vperfctr_read | 1425 | .long sys_inotify_rm_watch |
1426 | .long sys_migrate_pages | ||
1427 | .long sys_openat /* 295 */ | ||
1428 | .long sys_mkdirat | ||
1429 | .long sys_mknodat | ||
1430 | .long sys_fchownat | ||
1431 | .long sys_futimesat | ||
1432 | .long sys_newfstatat /* 300 */ | ||
1433 | .long sys_unlinkat | ||
1434 | .long sys_renameat | ||
1435 | .long sys_linkat | ||
1436 | .long sys_symlinkat | ||
1437 | .long sys_readlinkat /* 305 */ | ||
1438 | .long sys_fchmodat | ||
1439 | .long sys_faccessat | ||
1440 | .long sys_pselect6 | ||
1441 | .long sys_ppoll | ||
1426 | 1442 | ||
1427 | 1443 | ||
1428 | syscall_table_size = (. - sys_call_table) | 1444 | syscall_table_size = (. - sys_call_table) |
diff --git a/arch/frv/mm/kmap.c b/arch/frv/mm/kmap.c index 539f45e6d15e..c54f18e65ea6 100644 --- a/arch/frv/mm/kmap.c +++ b/arch/frv/mm/kmap.c | |||
@@ -44,15 +44,6 @@ void iounmap(void *addr) | |||
44 | } | 44 | } |
45 | 45 | ||
46 | /* | 46 | /* |
47 | * __iounmap unmaps nearly everything, so be careful | ||
48 | * it doesn't free currently pointer/page tables anymore but it | ||
49 | * wans't used anyway and might be added later. | ||
50 | */ | ||
51 | void __iounmap(void *addr, unsigned long size) | ||
52 | { | ||
53 | } | ||
54 | |||
55 | /* | ||
56 | * Set new cache mode for some kernel address space. | 47 | * Set new cache mode for some kernel address space. |
57 | * The caller must push data for that range itself, if such data may already | 48 | * The caller must push data for that range itself, if such data may already |
58 | * be in the cache. | 49 | * be in the cache. |