diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4c2267fd9f8..7d25402cb22 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-24  Nathan Sidwell  <nathan@acm.org>
+
+	* config/nvptx/nvptx.c (walk_args_for_param): Revert previous
+	change to nvptx_type_from_mode call. Use arg_promotion for both
+	split and non-split args.
+
 2015-08-24  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* target-insns.def (movstr): New pattern.
diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c
index e53249c983c..2e404eee4a3 100644
--- a/gcc/config/nvptx/nvptx.c
+++ b/gcc/config/nvptx/nvptx.c
@@ -405,17 +405,17 @@ walk_args_for_param (FILE *file, tree argtypes, tree args, bool write_copy,
 		mode = DFmode;
 
 	    }
-	  mode = arg_promotion (mode);
 	}
+      mode = arg_promotion (mode);
       while (count-- > 0)
 	{
 	  i++;
 	  if (write_copy)
 	    fprintf (file, "\tld.param%s %%ar%d, [%%in_ar%d];\n",
-		     nvptx_ptx_type_from_mode (mode, true), i, i);
+		     nvptx_ptx_type_from_mode (mode, false), i, i);
 	  else
 	    fprintf (file, "\t.reg%s %%ar%d;\n",
-		     nvptx_ptx_type_from_mode (mode, true), i);
+		     nvptx_ptx_type_from_mode (mode, false), i);
 	}
     }
 }