diff options
| author | Stephen Rothwell | 2005-05-01 17:59:12 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-05-01 17:59:12 +0200 |
| commit | 7d87e14c236d6c4cab66d87cf0bc1e0f0375d308 (patch) | |
| tree | 0c0826cdc102286b541e3e56b59c81752d34c90d /arch/ia64/kernel/entry.S | |
| parent | [PATCH] sn_console: make sal_console_uart static again (diff) | |
| download | kernel-qcow2-linux-7d87e14c236d6c4cab66d87cf0bc1e0f0375d308.tar.gz kernel-qcow2-linux-7d87e14c236d6c4cab66d87cf0bc1e0f0375d308.tar.xz kernel-qcow2-linux-7d87e14c236d6c4cab66d87cf0bc1e0f0375d308.zip | |
[PATCH] consolidate sys_shmat
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ia64/kernel/entry.S')
| -rw-r--r-- | arch/ia64/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index bd86fea49a0c..d3f093820bc7 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -1417,7 +1417,7 @@ sys_call_table: data8 sys_msgrcv data8 sys_msgctl data8 sys_shmget - data8 ia64_shmat + data8 sys_shmat data8 sys_shmdt // 1115 data8 sys_shmctl data8 sys_syslog |