From: eeb <eeb>
Date: Sat, 1 Oct 2005 11:48:42 +0000 (+0000)
Subject: *   Updated gm-reg-phys patch with the fix from Myricom that allows
X-Git-Tag: v1_7_100~1^25~6^2~119
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=24cfbcef53a763d620c60928be2fae306aab7551;p=fs%2Flustre-release.git

*   Updated gm-reg-phys patch with the fix from Myricom that allows
    userpace programs to link again.
---

diff --git a/lnet/klnds/gmlnd/gm-reg-phys.patch b/lnet/klnds/gmlnd/gm-reg-phys.patch
index 0847a13..df32a21 100644
--- a/lnet/klnds/gmlnd/gm-reg-phys.patch
+++ b/lnet/klnds/gmlnd/gm-reg-phys.patch
@@ -95,11 +95,13 @@ retrieving revision 1.3.14.1
 diff -u -r1.3.14.1 gm_reference_api.c
 --- libgm/gm_reference_api.c	23 Apr 2004 20:27:29 -0000	1.3.14.1
 +++ libgm/gm_reference_api.c	25 Aug 2005 22:39:20 -0000
-@@ -154,6 +154,7 @@
+@@ -154,6 +154,9 @@
  GM_REF (gm_register_buffer);
  GM_REF (gm_register_memory);
  GM_REF (gm_register_memory_ex);
++#if GM_KERNEL && (GM_CPU_x86 || GM_CPU_x86_64 || GM_CPU_ia64)
 +GM_REF (gm_register_memory_ex_phys);
++#endif
  GM_REF (gm_resume_sending);
  GM_REF (gm_send);
  GM_REF (gm_send_to_peer);