From 0b3376e5ea7971d4a4207f6f6d1f51cc1c38ad14 Mon Sep 17 00:00:00 2001 From: zab Date: Mon, 19 May 2003 23:22:18 +0000 Subject: [PATCH] portals builds and the kernel tries to link.. - add 2.5 build spew to .cvsignore - more relative makefile inclusion fixes - more unsigned long flags --- lnet/klnds/.cvsignore | 1 + lnet/klnds/socklnd/.cvsignore | 1 + lnet/libcfs/.cvsignore | 1 + lnet/lnet/.cvsignore | 1 + lnet/router/.cvsignore | 1 + lnet/router/Makefile.mk | 2 +- lnet/router/router.c | 10 +++++----- lustre/portals/knals/.cvsignore | 1 + lustre/portals/knals/socknal/.cvsignore | 1 + lustre/portals/libcfs/.cvsignore | 1 + lustre/portals/portals/.cvsignore | 1 + lustre/portals/router/.cvsignore | 1 + lustre/portals/router/Makefile.mk | 2 +- lustre/portals/router/router.c | 10 +++++----- 14 files changed, 22 insertions(+), 12 deletions(-) diff --git a/lnet/klnds/.cvsignore b/lnet/klnds/.cvsignore index 282522d..89a4aa6 100644 --- a/lnet/klnds/.cvsignore +++ b/lnet/klnds/.cvsignore @@ -1,2 +1,3 @@ Makefile Makefile.in +.*.o.cmd diff --git a/lnet/klnds/socklnd/.cvsignore b/lnet/klnds/socklnd/.cvsignore index e995588..95973d6 100644 --- a/lnet/klnds/socklnd/.cvsignore +++ b/lnet/klnds/socklnd/.cvsignore @@ -1,3 +1,4 @@ .deps Makefile Makefile.in +.*.o.cmd diff --git a/lnet/libcfs/.cvsignore b/lnet/libcfs/.cvsignore index 67d1a3d..7fa686f 100644 --- a/lnet/libcfs/.cvsignore +++ b/lnet/libcfs/.cvsignore @@ -2,3 +2,4 @@ Makefile Makefile.in link-stamp +.*.o.cmd diff --git a/lnet/lnet/.cvsignore b/lnet/lnet/.cvsignore index e995588..95973d6 100644 --- a/lnet/lnet/.cvsignore +++ b/lnet/lnet/.cvsignore @@ -1,3 +1,4 @@ .deps Makefile Makefile.in +.*.o.cmd diff --git a/lnet/router/.cvsignore b/lnet/router/.cvsignore index e995588..95973d6 100644 --- a/lnet/router/.cvsignore +++ b/lnet/router/.cvsignore @@ -1,3 +1,4 @@ .deps Makefile Makefile.in +.*.o.cmd diff --git a/lnet/router/Makefile.mk b/lnet/router/Makefile.mk index 64bd09b..dc007fc 100644 --- a/lnet/router/Makefile.mk +++ b/lnet/router/Makefile.mk @@ -3,7 +3,7 @@ # This code is issued under the GNU General Public License. # See the file COPYING in this distribution -include ../Kernelenv +include $(obj)/../Kernelenv obj-y += kptlrouter.o kptlrouter-objs := router.o proc.o diff --git a/lnet/router/router.c b/lnet/router/router.c index 8a1de08..d39e3c4 100644 --- a/lnet/router/router.c +++ b/lnet/router/router.c @@ -55,7 +55,7 @@ kpr_control_interface_t kpr_control_interface = { int kpr_register_nal (kpr_nal_interface_t *nalif, void **argp) { - long flags; + unsigned long flags; struct list_head *e; kpr_nal_entry_t *ne; @@ -98,7 +98,7 @@ kpr_register_nal (kpr_nal_interface_t *nalif, void **argp) void kpr_shutdown_nal (void *arg) { - long flags; + unsigned long flags; kpr_nal_entry_t *ne = (kpr_nal_entry_t *)arg; CDEBUG (D_OTHER, "Shutting down NAL %d\n", ne->kpne_interface.kprni_nalid); @@ -123,7 +123,7 @@ kpr_shutdown_nal (void *arg) void kpr_deregister_nal (void *arg) { - long flags; + unsigned long flags; kpr_nal_entry_t *ne = (kpr_nal_entry_t *)arg; CDEBUG (D_OTHER, "Deregister NAL %d\n", ne->kpne_interface.kprni_nalid); @@ -296,7 +296,7 @@ int kpr_add_route (int gateway_nalid, ptl_nid_t gateway_nid, ptl_nid_t lo_nid, ptl_nid_t hi_nid) { - long flags; + unsigned long flags; struct list_head *e; kpr_route_entry_t *re; @@ -345,7 +345,7 @@ kpr_add_route (int gateway_nalid, ptl_nid_t gateway_nid, ptl_nid_t lo_nid, int kpr_del_route (ptl_nid_t nid) { - long flags; + unsigned long flags; struct list_head *e; CDEBUG(D_OTHER, "Del route "LPX64"\n", nid); diff --git a/lustre/portals/knals/.cvsignore b/lustre/portals/knals/.cvsignore index 282522d..89a4aa6 100644 --- a/lustre/portals/knals/.cvsignore +++ b/lustre/portals/knals/.cvsignore @@ -1,2 +1,3 @@ Makefile Makefile.in +.*.o.cmd diff --git a/lustre/portals/knals/socknal/.cvsignore b/lustre/portals/knals/socknal/.cvsignore index e995588..95973d6 100644 --- a/lustre/portals/knals/socknal/.cvsignore +++ b/lustre/portals/knals/socknal/.cvsignore @@ -1,3 +1,4 @@ .deps Makefile Makefile.in +.*.o.cmd diff --git a/lustre/portals/libcfs/.cvsignore b/lustre/portals/libcfs/.cvsignore index 67d1a3d..7fa686f 100644 --- a/lustre/portals/libcfs/.cvsignore +++ b/lustre/portals/libcfs/.cvsignore @@ -2,3 +2,4 @@ Makefile Makefile.in link-stamp +.*.o.cmd diff --git a/lustre/portals/portals/.cvsignore b/lustre/portals/portals/.cvsignore index e995588..95973d6 100644 --- a/lustre/portals/portals/.cvsignore +++ b/lustre/portals/portals/.cvsignore @@ -1,3 +1,4 @@ .deps Makefile Makefile.in +.*.o.cmd diff --git a/lustre/portals/router/.cvsignore b/lustre/portals/router/.cvsignore index e995588..95973d6 100644 --- a/lustre/portals/router/.cvsignore +++ b/lustre/portals/router/.cvsignore @@ -1,3 +1,4 @@ .deps Makefile Makefile.in +.*.o.cmd diff --git a/lustre/portals/router/Makefile.mk b/lustre/portals/router/Makefile.mk index 64bd09b..dc007fc 100644 --- a/lustre/portals/router/Makefile.mk +++ b/lustre/portals/router/Makefile.mk @@ -3,7 +3,7 @@ # This code is issued under the GNU General Public License. # See the file COPYING in this distribution -include ../Kernelenv +include $(obj)/../Kernelenv obj-y += kptlrouter.o kptlrouter-objs := router.o proc.o diff --git a/lustre/portals/router/router.c b/lustre/portals/router/router.c index 8a1de08..d39e3c4 100644 --- a/lustre/portals/router/router.c +++ b/lustre/portals/router/router.c @@ -55,7 +55,7 @@ kpr_control_interface_t kpr_control_interface = { int kpr_register_nal (kpr_nal_interface_t *nalif, void **argp) { - long flags; + unsigned long flags; struct list_head *e; kpr_nal_entry_t *ne; @@ -98,7 +98,7 @@ kpr_register_nal (kpr_nal_interface_t *nalif, void **argp) void kpr_shutdown_nal (void *arg) { - long flags; + unsigned long flags; kpr_nal_entry_t *ne = (kpr_nal_entry_t *)arg; CDEBUG (D_OTHER, "Shutting down NAL %d\n", ne->kpne_interface.kprni_nalid); @@ -123,7 +123,7 @@ kpr_shutdown_nal (void *arg) void kpr_deregister_nal (void *arg) { - long flags; + unsigned long flags; kpr_nal_entry_t *ne = (kpr_nal_entry_t *)arg; CDEBUG (D_OTHER, "Deregister NAL %d\n", ne->kpne_interface.kprni_nalid); @@ -296,7 +296,7 @@ int kpr_add_route (int gateway_nalid, ptl_nid_t gateway_nid, ptl_nid_t lo_nid, ptl_nid_t hi_nid) { - long flags; + unsigned long flags; struct list_head *e; kpr_route_entry_t *re; @@ -345,7 +345,7 @@ kpr_add_route (int gateway_nalid, ptl_nid_t gateway_nid, ptl_nid_t lo_nid, int kpr_del_route (ptl_nid_t nid) { - long flags; + unsigned long flags; struct list_head *e; CDEBUG(D_OTHER, "Del route "LPX64"\n", nid); -- 1.8.3.1