[openib-general] [PATCH][18/19] kDAPL: Remove typedef DAT_MEM_OPTIMIZE_FLAGS & #define DAT_MEM_OPT

[Tom Duffy]

Signed-off-by: Tom Duffy <tduffy at sun.com>

diff -Nurp -X /home/tduffy/dontdiff linux-kernel17/dat/dat.h linux-kernel18/dat/dat.h
--- linux-kernel17/dat/dat.h	2005-05-13 15:54:55.036006000 -0700
+++ linux-kernel18/dat/dat.h	2005-05-13 16:08:45.452018000 -0700
@@ -959,14 +959,12 @@ struct dat_evd_param {
  */
 
 /* memory data types */
-#define DAT_MEM_OPT DAT_MEM_OPTIMIZE_FLAGS
-
-typedef enum dat_mem_optimize_flags {
+enum dat_mem_optimize_flags {
 	DAT_MEM_OPTIMIZE_DONT_CARE = 0x00,
 	DAT_MEM_OPTIMIZE_IA = 0x01,
 	DAT_MEM_OPTIMIZE_MIN_EXPOSURE = 0x02,
 	DAT_MEM_OPTIMIZE_EXACT_EXPOSURE = 0x04
-} DAT_MEM_OPTIMIZE_FLAGS;
+};
 
 typedef union dat_region_description {
 	void *for_va;
@@ -1251,12 +1249,13 @@ typedef u32 (*DAT_SRQ_POST_RECV_FUNC)(DA
 typedef u32 (*DAT_LMR_KCREATE_FUNC)(DAT_IA_HANDLE, enum dat_mem_type,
 				    DAT_REGION_DESCRIPTION, u64,
 				    DAT_PZ_HANDLE, enum dat_mem_priv_flags,
-				    DAT_MEM_OPTIMIZE_FLAGS, DAT_LMR_HANDLE *,
+				    enum dat_mem_optimize_flags,
+				    DAT_LMR_HANDLE *,
 				    DAT_LMR_CONTEXT *, DAT_RMR_CONTEXT *,
 				    u64 *, u64 *);
 
 typedef u32 (*DAT_IA_MEMTYPE_HINT_FUNC)(DAT_IA_HANDLE, enum dat_mem_type, u64,
-					DAT_MEM_OPTIMIZE_FLAGS, u64 *,
+					enum dat_mem_optimize_flags, u64 *,
 					u64 *);
 
 typedef u32 (*DAT_EVD_KCREATE_FUNC) (DAT_IA_HANDLE, int, enum dat_upcall_policy,
@@ -1415,7 +1414,7 @@ static inline u32 dat_get_handle_type(DA
 static inline u32 dat_ia_memtype_hint(DAT_IA_HANDLE ia,
 				      enum dat_mem_type mem_type,
 				      u64 length,
-				      DAT_MEM_OPTIMIZE_FLAGS mem_optimize,
+				      enum dat_mem_optimize_flags mem_optimize,
 				      u64 *preferred_length,
 				      u64 *preferred_alignment)
 {
@@ -1779,7 +1778,7 @@ static inline u32 dat_lmr_kcreate(DAT_IA
 				  DAT_REGION_DESCRIPTION region, u64 len,
 				  DAT_PZ_HANDLE pz,
 				  enum dat_mem_priv_flags privileges,
-				  DAT_MEM_OPTIMIZE_FLAGS optimization,
+				  enum dat_mem_optimize_flags optimization,
 				  DAT_LMR_HANDLE *lmr_handle,
 				  DAT_LMR_CONTEXT *lmr_context,
 				  DAT_RMR_CONTEXT *rmr_context,
diff -Nurp -X /home/tduffy/dontdiff linux-kernel17/dat-provider/dapl.h linux-kernel18/dat-provider/dapl.h
--- linux-kernel17/dat-provider/dapl.h	2005-05-13 15:52:28.068010000 -0700
+++ linux-kernel18/dat-provider/dapl.h	2005-05-13 16:09:23.703026000 -0700
@@ -507,7 +507,8 @@ extern u32 dapl_cr_handoff(DAT_CR_HANDLE
 /* EVD Functions */
 extern u32 dapl_ia_memtype_hint(DAT_IA_HANDLE ia_handle,
 				enum dat_mem_type mem_type,
-				u64 length, DAT_MEM_OPT mem_optimization,
+				u64 length,
+				enum dat_mem_optimize_flags mem_optimization,
 				u64 *suggested_length,
 				u64 *suggested_alignment);
 
@@ -629,7 +630,7 @@ extern u32 dapl_lmr_kcreate(DAT_IA_HANDL
 			    DAT_REGION_DESCRIPTION region_description,
 			    u64 length, DAT_PZ_HANDLE pz_handle,
 			    enum dat_mem_priv_flags privileges,
-			    DAT_MEM_OPT optimization,
+			    enum dat_mem_optimize_flags optimization,
 			    DAT_LMR_HANDLE *lmr_handle,
 			    DAT_LMR_CONTEXT *lmr_context,
 			    DAT_RMR_CONTEXT *rmr_context,
diff -Nurp -X /home/tduffy/dontdiff linux-kernel17/dat-provider/dapl_ia_memtype_hint.c linux-kernel18/dat-provider/dapl_ia_memtype_hint.c
--- linux-kernel17/dat-provider/dapl_ia_memtype_hint.c	2005-05-13 14:14:08.086967000 -0700
+++ linux-kernel18/dat-provider/dapl_ia_memtype_hint.c	2005-05-13 16:09:42.646010000 -0700
@@ -64,7 +64,8 @@
  * 	DAT_MODEL_NOT_SUPPORTED
  */
 u32 dapl_ia_memtype_hint(DAT_IA_HANDLE ia_handle, enum dat_mem_type mem_type,
-			 u64 length, DAT_MEM_OPT mem_optimization,
+			 u64 length,
+			 enum dat_mem_optimize_flags mem_optimization,
 			 u64 *suggested_length,
 			 u64 *suggested_alignment)
 {
diff -Nurp -X /home/tduffy/dontdiff linux-kernel17/dat-provider/dapl_lmr_kcreate.c linux-kernel18/dat-provider/dapl_lmr_kcreate.c
--- linux-kernel17/dat-provider/dapl_lmr_kcreate.c	2005-05-13 14:23:13.154000000 -0700
+++ linux-kernel18/dat-provider/dapl_lmr_kcreate.c	2005-05-13 15:58:51.348026000 -0700
@@ -305,7 +305,7 @@ u32 dapl_lmr_kcreate(DAT_IA_HANDLE ia_ha
 		     DAT_REGION_DESCRIPTION region_description, u64 length,
 		     DAT_PZ_HANDLE pz_handle,
 		     enum dat_mem_priv_flags privileges,
-		     DAT_MEM_OPT optimization, DAT_LMR_HANDLE *lmr_handle,
+		     enum dat_mem_optimize_flags optimization, DAT_LMR_HANDLE *lmr_handle,
 		     DAT_LMR_CONTEXT *lmr_context, DAT_RMR_CONTEXT *rmr_context,		     u64 *registered_length, u64 *registered_address)
 {
 	DAPL_IA *ia;