patch-2.4.0-test5 linux/arch/sparc64/kernel/ioctl32.c

• Lines: 45
• Date: Wed Jul 26 18:36:44 2000
• Orig file: v2.4.0-test4/linux/arch/sparc64/kernel/ioctl32.c
• Orig date: Fri Jun 23 21:55:08 2000

diff -u --recursive --new-file v2.4.0-test4/linux/arch/sparc64/kernel/ioctl32.c linux/arch/sparc64/kernel/ioctl32.c
@@ -1,4 +1,4 @@
-/* $Id: ioctl32.c,v 1.92 2000/05/26 22:44:11 davem Exp $
+/* $Id: ioctl32.c,v 1.93 2000/07/24 22:43:15 anton Exp $
  * ioctl32.c: Conversion between 32bit and 64bit native ioctls.
  *
  * Copyright (C) 1997-2000  Jakub Jelinek  (jakub@redhat.com)
@@ -1085,7 +1085,7 @@
 		{
 			struct floppy_struct *f;
 
-			f = karg = kmalloc(GFP_KERNEL, sizeof(struct floppy_struct));
+			f = karg = kmalloc(sizeof(struct floppy_struct), GFP_KERNEL);
 			if (!karg)
 				return -ENOMEM;
 			if (cmd == FDGETPRM32)
@@ -1111,7 +1111,7 @@
 		{
 			struct floppy_drive_params *f;
 
-			f = karg = kmalloc(GFP_KERNEL, sizeof(struct floppy_drive_params));
+			f = karg = kmalloc(sizeof(struct floppy_drive_params), GFP_KERNEL);
 			if (!karg)
 				return -ENOMEM;
 			if (cmd == FDGETDRVPRM32)
@@ -1143,17 +1143,17 @@
 		}
 		case FDGETDRVSTAT32:
 		case FDPOLLDRVSTAT32:
-			karg = kmalloc(GFP_KERNEL, sizeof(struct floppy_drive_struct));
+			karg = kmalloc(sizeof(struct floppy_drive_struct), GFP_KERNEL);
 			if (!karg)
 				return -ENOMEM;
 			break;
 		case FDGETFDCSTAT32:
-			karg = kmalloc(GFP_KERNEL, sizeof(struct floppy_fdc_state));
+			karg = kmalloc(sizeof(struct floppy_fdc_state), GFP_KERNEL);
 			if (!karg)
 				return -ENOMEM;
 			break;
 		case FDWERRORGET32:
-			karg = kmalloc(GFP_KERNEL, sizeof(struct floppy_write_errors));
+			karg = kmalloc(sizeof(struct floppy_write_errors), GFP_KERNEL);
 			if (!karg)
 				return -ENOMEM;
 			break;