From 1046bf7904dd323e1cd1c1788870052c315ec2a3 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Thu, 30 Aug 2012 17:10:36 -0500 Subject: [PATCH] rx: More afspag-specific objects For Linux, each object in the kernel module needs to be in only one module for KBUILD_MODNAME. For AFS_RXERRQ_ENV, we pull in some additional headers that require KBUILD_MODNAME in rx. So, just add a few more afspag-specific rx objects. Change-Id: I80b4a8648141856dffce6e26d5c034dffd8dd5cf Reviewed-on: http://gerrit.openafs.org/8113 Reviewed-by: Marc Dionne Reviewed-by: Derrick Brashear Tested-by: Andrew Deason --- src/libafs/Makefile.common.in | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/libafs/Makefile.common.in b/src/libafs/Makefile.common.in index dfcde69580..e70c7dfcc8 100644 --- a/src/libafs/Makefile.common.in +++ b/src/libafs/Makefile.common.in @@ -231,23 +231,23 @@ AFSPAGOBJS = \ xdr_array.o \ xdr_int32.o \ xdr_int64.o \ - rx.o \ - rx_call.o \ + rx_pag.o \ + rx_pag_call.o \ rx_conn.o \ rx_peer.o \ - rx_rdwr.o \ + rx_pag_rdwr.o \ rx_clock.o \ rx_event.o \ rx_globals.o \ rx_identity.o \ rx_kmutex.o \ rx_pag_knet.o \ - rx_kcommon.o \ + rx_pag_kcommon.o \ rx_misc.o \ rx_null.o \ rx_opaque.o \ rx_getaddr.o \ - rx_packet.o \ + rx_pag_packet.o \ rx_multi.o \ rx_stats.o \ opr_rbtree.o \ @@ -522,6 +522,16 @@ afs_pioctl_nfs.o: $(TOP_SRC_AFS)/afs_pioctl.c # Special objects for the PAG module afs_pag_user.o: $(TOP_SRC_AFS)/afs_user.c $(CRULE_OPT) -DAFS_PAG_MANAGER $(TOP_SRC_AFS)/afs_user.c +rx_pag.o: $(TOP_SRC_RX)/rx.c + $(CRULE_NOOPT) $(TOP_SRC_RX)/rx.c +rx_pag_call.o: $(TOP_SRC_RX)/rx_call.c + $(CRULE_NOOPT) $(TOP_SRC_RX)/rx_call.c +rx_pag_rdwr.o: $(TOP_SRC_RX)/rx_rdwr.c + $(CRULE_NOOPT) $(TOP_SRC_RX)/rx_rdwr.c +rx_pag_kcommon.o: $(TOP_SRC_RX)/rx_kcommon.c + $(CRULE_NOOPT) $(TOP_SRC_RX)/rx_kcommon.c +rx_pag_packet.o: $(TOP_SRC_RX)/rx_packet.c + $(CRULE_NOOPT) $(TOP_SRC_RX)/rx_packet.c rx_pag_knet.o: $(TOP_SRC_RX)/${MKAFS_OSTYPE}/rx_knet.c $(CRULE_NOOPT) $(TOP_SRC_RX)/${MKAFS_OSTYPE}/rx_knet.c