tiny changes to accompany the Portals update which follows.

diff --git a/lustre/archdep.m4 b/lustre/archdep.m4
index 7c7a1c8..9054ebb 100644 (file)
--- a/lustre/archdep.m4
+++ b/lustre/archdep.m4
@@ -15,7 +15,7 @@ AC_MSG_CHECKING(setting make flags system architecture: )
 case ${host_cpu} in
        um )
        AC_MSG_RESULT($host_cpu)
-       KCFLAGS='-g -Wall -pipe -Wno-trigraphs -Wstrict-prototypes -fno-strict-aliasing -fno-common '
+       KCFLAGS='-g  -Wall -pipe -Wno-trigraphs -Wstrict-prototypes -fno-strict-aliasing -fno-common '
        KCPPFLAGS='-D__KERNEL__ -U__i386__ -Ui386 -DUM_FASTCALL -D__arch_um__ -DSUBARCH="i386" -DNESTING=0 -D_LARGEFILE64_SOURCE  -Derrno=kernel_errno -DPATCHLEVEL=4 -DMODULE -I$(LINUX)/arch/um/include '
         MOD_LINK=elf_i386
 ;;

diff --git a/lustre/ptlrpc/niobuf.c b/lustre/ptlrpc/niobuf.c
index bfbd55a..bbb4729 100644 (file)
--- a/lustre/ptlrpc/niobuf.c
+++ b/lustre/ptlrpc/niobuf.c
@@ -26,7 +26,7 @@
 
 extern ptl_handle_eq_t request_out_eq, reply_in_eq, reply_out_eq,
         bulk_source_eq, bulk_sink_eq;
-static ptl_process_id_t local_id = {PTL_ID_ANY, PTL_ID_ANY};
+static ptl_process_id_t local_id = {PTL_NID_ANY, PTL_PID_ANY};
 
 int ptlrpc_check_bulk_sent(struct ptlrpc_bulk_desc *bulk)
 {