diff options
| author | Andi Kleen <ak@suse.de> | 2003-07-01 02:35:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2003-07-01 02:35:22 -0700 |
| commit | d55e45edb3ffb76f12fc2b77b1a3b7db49b411cf (patch) | |
| tree | 7eaa9deebbd9d0af085818e9bae1e7e4f900ab52 /ipc | |
| parent | d7d5f795cf3d7cca5d0f11344bacd821d9714294 (diff) | |
| download | history-d55e45edb3ffb76f12fc2b77b1a3b7db49b411cf.tar.gz | |
[PATCH] Fix IPC ABI for AMD64
AMD64 like IA64 needs to force IPC_64 in the IPC functions. This makes
2.5 compatible with 2.4 again.
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/util.c | 2 | ||||
| -rw-r--r-- | ipc/util.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ipc/util.c b/ipc/util.c index b1e76464b850be..c6d0af6a033aaa 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -508,7 +508,7 @@ int ipc_checkid(struct ipc_ids* ids, struct kern_ipc_perm* ipcp, int uid) return 0; } -#ifndef __ia64__ +#if !defined(__ia64__) && !defined(__x86_64__) /** * ipc_parse_version - IPC call version diff --git a/ipc/util.h b/ipc/util.h index f4d418587a9648..833c2642118d56 100644 --- a/ipc/util.h +++ b/ipc/util.h @@ -56,7 +56,7 @@ int ipc_checkid(struct ipc_ids* ids, struct kern_ipc_perm* ipcp, int uid); 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__ +#if defined(__ia64__) || defined(__x86_64__) /* On IA-64, we always use the "64-bit version" of the IPC structures. */ # define ipc_parse_version(cmd) IPC_64 #else |