From b9c9be4babc994cf7b4b971004f969517e1abc5b Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Fri, 27 Jun 2003 15:09:58 +0000 Subject: [PATCH] STABLE12-rx-xdr-rename-userland-symbols-also-on-amd64-linux-20030627 pull up fix for amd64 xdr problem (cherry picked from commit def59db27bb8a6b2b123547b30054d8ff380366e) --- src/rx/xdr.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/rx/xdr.h b/src/rx/xdr.h index 5f899ac4a..f56fd6d60 100644 --- a/src/rx/xdr.h +++ b/src/rx/xdr.h @@ -61,12 +61,7 @@ #define mem_free(ptr, bsize) free(ptr) #endif -#ifdef KERNEL -void *afs_osi_Alloc(); -#define osi_alloc afs_osi_Alloc -#define osi_free afs_osi_Free - -#ifndef UKERNEL +#if defined(AFS_AMD64_LINUX24_ENV) || (defined(KERNEL) && !defined(UKERNEL)) #define xdr_void afs_xdr_void #define xdr_int afs_xdr_int #define xdr_u_int afs_xdr_u_int @@ -92,6 +87,17 @@ void *afs_osi_Alloc(); #define xdr_int64 afs_xdr_int64 #define xdr_uint64 afs_xdr_uint64 #endif + +#ifdef KERNEL +void *afs_osi_Alloc(); +#define osi_alloc afs_osi_Alloc +#define osi_free afs_osi_Free + +/* keep here for now, 64 bit issues */ +extern void *afs_osi_Alloc(size_t x); +extern void *afs_osi_Alloc_NoSleep(size_t x); +extern void afs_osi_Free(void *x, size_t asize); + #endif #ifndef major /* ouch! */ #include -- 2.39.5