diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 66ca88442ee..ff76d9ca3e4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-19  Christian Borntraeger  <borntraeger@de.ibm.com>
+
+	* config/s390/s390.c (s390_function_arg_integer): Handle NULLPTR_TYPE.
+
 2010-11-19  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/45870
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 2c40b67811b..0573b2659e6 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -8433,6 +8433,7 @@ s390_function_arg_integer (enum machine_mode mode, const_tree type)
   /* We accept small integral (and similar) types.  */
   if (INTEGRAL_TYPE_P (type)
       || POINTER_TYPE_P (type)
+      || TREE_CODE (type) == NULLPTR_TYPE
       || TREE_CODE (type) == OFFSET_TYPE
       || (TARGET_SOFT_FLOAT && TREE_CODE (type) == REAL_TYPE))
     return true;