From aedccbc85d491e41711a0c6eb0d246d8700a199a Mon Sep 17 00:00:00 2001
From: "Field G. Van Zee" <field@cs.utexas.edu>
Date: Wed, 13 Feb 2013 18:29:53 -0600
Subject: [PATCH] Fixed stale interface to packm_unb_var1().

Details:
- Removed the control tree from the interface to packm_unb_var1(), which
  I meant to do when it was un-deprecated.
---
 frame/1m/packm/bl2_packm_unb_var1.c | 9 ++++++---
 frame/1m/packm/bl2_packm_unb_var1.h | 3 +--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frame/1m/packm/bl2_packm_unb_var1.c b/frame/1m/packm/bl2_packm_unb_var1.c
index 8b62cfcca..06fcd580b 100644
--- a/frame/1m/packm/bl2_packm_unb_var1.c
+++ b/frame/1m/packm/bl2_packm_unb_var1.c
@@ -57,8 +57,7 @@ static FUNCPTR_T GENARRAY(ftypes,packm_unb_var1);
 
 void bl2_packm_unb_var1( obj_t*   beta,
                          obj_t*   c,
-                         obj_t*   p,
-                         packm_t* cntl )
+                         obj_t*   p )
 {
 	num_t     dt_cp     = bl2_obj_datatype( *c );
 	mem_t*    mem_p     = bl2_obj_pack_mem( *p );
@@ -68,7 +67,7 @@ void bl2_packm_unb_var1( obj_t*   beta,
 	diag_t    diagc     = bl2_obj_diag( *c );
 	uplo_t    uploc     = bl2_obj_uplo( *c );
 	trans_t   transc    = bl2_obj_conjtrans_status( *c );
-	bool_t    densify   = cntl_does_densify( cntl );
+	bool_t    densify;
 
 	dim_t     m_p       = bl2_obj_length( *p );
 	dim_t     n_p       = bl2_obj_width( *p );
@@ -87,6 +86,10 @@ void bl2_packm_unb_var1( obj_t*   beta,
 
 	FUNCPTR_T f;
 
+	// Set densify based on the uplo property of p.
+	if ( bl2_obj_is_dense( *p ) ) densify = TRUE;
+	else                          densify = FALSE;
+
 	// Index into the type combination array to extract the correct
 	// function pointer.
 	f = ftypes[dt_cp];
diff --git a/frame/1m/packm/bl2_packm_unb_var1.h b/frame/1m/packm/bl2_packm_unb_var1.h
index b5abb057c..686b3f759 100644
--- a/frame/1m/packm/bl2_packm_unb_var1.h
+++ b/frame/1m/packm/bl2_packm_unb_var1.h
@@ -34,8 +34,7 @@
 
 void bl2_packm_unb_var1( obj_t*   beta,
                          obj_t*   c,
-                         obj_t*   p,
-                         packm_t* cntl );
+                         obj_t*   p );
 
 
 #undef  GENTPROT