Merge davem@nuts.davemloft.net:/disk1/BK/sparc-2.6

into kernel.bkbits.net:/home/davem/sparc-2.6

arch/sparc64/kernel/sys_sparc32.c

@@ -1481,13 +1481,12 @@ asmlinkage int sys32_mount(char *dev_name, char *dir_name, char *type, unsigned
 	if (err)
 		goto out;
 
-	if (!type_page) {
-		err = -EINVAL;
-		goto out;
-	}
-
+	if (type_page) {
 		is_smb = !strcmp((char *)type_page, SMBFS_NAME);
 		is_ncp = !strcmp((char *)type_page, NCPFS_NAME);
+	} else {
+		is_smb = is_ncp = 0;
+	}
 
 	err = copy_mount_stuff_to_kernel((const void *)AA(data), &data_page);
 	if (err)