diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
| commit | 3797ba0b62debb71af4606910acacc9896a9ae3b (patch) | |
| tree | 414eea76253c7871bfdf3bd9d1817771eb40917c /ipc | |
| parent | 2b6c0c580795a4404f72d2a794214dd9e080709d (diff) | |
Merge with Linux 2.4.0-test2.
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/shm.c | 4 | ||||
| -rw-r--r-- | ipc/util.c | 6 | ||||
| -rw-r--r-- | ipc/util.h | 5 |
3 files changed, 12 insertions, 3 deletions
@@ -52,7 +52,7 @@ static struct super_block *shm_read_super(struct super_block *,void *, int); static void shm_put_super (struct super_block *); static int shm_remount_fs (struct super_block *, int *, char *); static void shm_read_inode (struct inode *); -static void shm_write_inode(struct inode *, int); +static void shm_write_inode(struct inode *); static int shm_statfs (struct super_block *, struct statfs *); static int shm_create (struct inode *,struct dentry *,int); static struct dentry *shm_lookup (struct inode *,struct dentry *); @@ -371,7 +371,7 @@ static int shm_statfs(struct super_block *sb, struct statfs *buf) return 0; } -static void shm_write_inode(struct inode * inode, int unused) +static void shm_write_inode(struct inode * inode) { } diff --git a/ipc/util.c b/ipc/util.c index a72dc14e6..66eae7215 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -312,6 +312,8 @@ void ipc64_perm_to_ipc_perm (struct ipc64_perm *in, struct ipc_perm *out) out->seq = in->seq; } +#ifndef __ia64__ + /** * ipc_parse_version - IPC call version * @cmd: pointer to command @@ -331,6 +333,8 @@ int ipc_parse_version (int *cmd) } } +#endif /* __ia64__ */ + #else /* * Dummy functions when SYSV IPC isn't configured @@ -408,7 +412,7 @@ void shm_unuse(swp_entry_t entry, struct page *page) int map_zero_setup(struct vm_area_struct *vma) { - return -ENOSYS; + return -EINVAL; } #endif /* CONFIG_SYSVIPC */ diff --git a/ipc/util.h b/ipc/util.h index cde68bcad..ff4bfb0fc 100644 --- a/ipc/util.h +++ b/ipc/util.h @@ -99,4 +99,9 @@ extern inline int ipc_checkid(struct ipc_ids* ids, struct kern_ipc_perm* ipcp, i void kernel_to_ipc64_perm(struct kern_ipc_perm *in, struct ipc64_perm *out); void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out); +#ifdef __ia64__ + /* On IA-64, we always use the "64-bit version" of the IPC structures. */ +# define ipc_parse_version(cmd) IPC_64 +#else int ipc_parse_version (int *cmd); +#endif |