From f16056cae9a3dcc58a11e2a53336825dbe187066 Mon Sep 17 00:00:00 2001 From: phil Date: Tue, 11 Jan 2005 13:10:59 +0000 Subject: [PATCH] We only really care about this at one place (NERSC, which uses x86_64), so do the reasonable thing and enable multi-frag only on non-HIGHMEM platforms, where there's no kmap-deadlock risk. --- lnet/klnds/socklnd/socklnd.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h index d25e132..7f08029 100644 --- a/lnet/klnds/socklnd/socklnd.h +++ b/lnet/klnds/socklnd/socklnd.h @@ -105,8 +105,14 @@ #define SOCKNAL_SINGLE_FRAG_TX 0 /* disable multi-fragment sends */ #define SOCKNAL_SINGLE_FRAG_RX 0 /* disable multi-fragment receives */ -#define SOCKNAL_RISK_KMAP_DEADLOCK 1 /* risk kmap deadlock on multi-frag I/O - * (backs off to single-frag if disabled) */ + +/* risk kmap deadlock on multi-frag I/O (backs off to single-frag if disabled). + * no risk if we're not running on a CONFIG_HIGHMEM platform. */ +#ifdef CONFIG_HIGHMEM +# define SOCKNAL_RISK_KMAP_DEADLOCK 0 +#else +# define SOCKNAL_RISK_KMAP_DEADLOCK 1 +#endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,72)) # define sk_allocation allocation -- 1.8.3.1