diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-23 14:05:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-23 14:05:01 +0000 |
| commit | f3627cbe9236a062012c836f3b6ee311b43f63f2 (patch) | |
| tree | ae854838b9a73b35bd0f3b8f42e5fb7f9cb1d5a9 /arch/sparc64/kernel | |
| parent | fea12a7b3f20bc135ab533491411e9ff753c01c8 (diff) | |
Merge with Linux 2.4.0-test5-pre4.
Diffstat (limited to 'arch/sparc64/kernel')
| -rw-r--r-- | arch/sparc64/kernel/ioctl32.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc64/kernel/ioctl32.c b/arch/sparc64/kernel/ioctl32.c index c424722a5..795960fea 100644 --- a/arch/sparc64/kernel/ioctl32.c +++ b/arch/sparc64/kernel/ioctl32.c @@ -1085,7 +1085,7 @@ static int fd_ioctl_trans(unsigned int fd, unsigned int cmd, unsigned long arg) { 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 @@ static int fd_ioctl_trans(unsigned int fd, unsigned int cmd, unsigned long arg) { 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 @@ static int fd_ioctl_trans(unsigned int fd, unsigned int cmd, unsigned long arg) } 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; |