Christoph Hellwig
5cacdb4add
Add generic sys_olduname()
...
Add generic implementations of the old and really old uname system calls.
Note that sh only implements sys_olduname but not sys_oldolduname, but I'm
not going to bother with another ifdef for that special case.
m32r implemented an old uname but never wired it up, so kill it, too.
Signed-off-by: Christoph Hellwig <hch@lst.de >
Cc: Ralf Baechle <ralf@linux-mips.org >
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org >
Cc: Paul Mundt <lethal@linux-sh.org >
Cc: Jeff Dike <jdike@addtoit.com >
Cc: Hirokazu Takata <takata@linux-m32r.org >
Cc: Thomas Gleixner <tglx@linutronix.de >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: H. Peter Anvin <hpa@zytor.com >
Cc: Al Viro <viro@zeniv.linux.org.uk >
Cc: Arnd Bergmann <arnd@arndb.de >
Cc: Heiko Carstens <heiko.carstens@de.ibm.com >
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com >
Cc: "Luck, Tony" <tony.luck@intel.com >
Cc: James Morris <jmorris@namei.org >
Cc: Andreas Schwab <schwab@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:32 -08:00
Christoph Hellwig
e28cbf2293
improve sys_newuname() for compat architectures
...
On an architecture that supports 32-bit compat we need to override the
reported machine in uname with the 32-bit value. Instead of doing this
separately in every architecture introduce a COMPAT_UTS_MACHINE define in
<asm/compat.h> and apply it directly in sys_newuname().
Signed-off-by: Christoph Hellwig <hch@lst.de >
Cc: Ralf Baechle <ralf@linux-mips.org >
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org >
Cc: Paul Mundt <lethal@linux-sh.org >
Cc: Jeff Dike <jdike@addtoit.com >
Cc: Hirokazu Takata <takata@linux-m32r.org >
Cc: Thomas Gleixner <tglx@linutronix.de >
Cc: Ingo Molnar <mingo@elte.hu >
Cc: H. Peter Anvin <hpa@zytor.com >
Cc: Al Viro <viro@zeniv.linux.org.uk >
Cc: Arnd Bergmann <arnd@arndb.de >
Cc: Heiko Carstens <heiko.carstens@de.ibm.com >
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com >
Cc: "Luck, Tony" <tony.luck@intel.com >
Cc: James Morris <jmorris@namei.org >
Cc: Andreas Schwab <schwab@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:32 -08:00
Christoph Hellwig
baed7fc9b5
Add generic sys_ipc wrapper
...
Add a generic implementation of the ipc demultiplexer syscall. Except for
s390 and sparc64 all implementations of the sys_ipc are nearly identical.
There are slight differences in the types of the parameters, where mips
and powerpc as the only 64-bit architectures with sys_ipc use unsigned
long for the "third" argument as it gets casted to a pointer later, while
it traditionally is an "int" like most other paramters. frv goes even
further and uses unsigned long for all parameters execept for "ptr" which
is a pointer type everywhere. The change from int to unsigned long for
"third" and back to "int" for the others on frv should be fine due to the
in-register calling conventions for syscalls (we already had a similar
issue with the generic sys_ptrace), but I'd prefer to have the arch
maintainers looks over this in details.
Except for that h8300, m68k and m68knommu lack an impplementation of the
semtimedop sub call which this patch adds, and various architectures have
gets used - at least on i386 it seems superflous as the compat code on
x86-64 and ia64 doesn't even bother to implement it.
[akpm@linux-foundation.org: add sys_ipc to sys_ni.c]
Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Reviewed-by: H. Peter Anvin <hpa@zytor.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: James Morris <jmorris@namei.org>
Cc: Andreas Schwab <schwab@linux-m68k.org>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: David Howells <dhowells@redhat.com>
Acked-by: Kyle McMartin <kyle@mcmartin.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-03-12 15:52:32 -08:00
Christoph Hellwig
a4679373cf
Add generic sys_old_mmap()
...
Add a generic implementation of the old mmap() syscall, which expects its
argument in a memory block and switch all architectures over to use it.
Signed-off-by: Christoph Hellwig <hch@lst.de >
Cc: Ralf Baechle <ralf@linux-mips.org >
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org >
Cc: Paul Mundt <lethal@linux-sh.org >
Cc: Jeff Dike <jdike@addtoit.com >
Cc: Hirokazu Takata <takata@linux-m32r.org >
Cc: Thomas Gleixner <tglx@linutronix.de >
Cc: Ingo Molnar <mingo@elte.hu >
Reviewed-by: H. Peter Anvin <hpa@zytor.com >
Cc: Al Viro <viro@zeniv.linux.org.uk >
Cc: Arnd Bergmann <arnd@arndb.de >
Cc: Heiko Carstens <heiko.carstens@de.ibm.com >
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com >
Cc: "Luck, Tony" <tony.luck@intel.com >
Cc: James Morris <jmorris@namei.org >
Cc: Andreas Schwab <schwab@linux-m68k.org >
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com >
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk >
Acked-by: Greg Ungerer <gerg@uclinux.org >
Acked-by: David Howells <dhowells@redhat.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:32 -08:00
Christoph Hellwig
5d0e52830e
Add generic sys_old_select()
...
Add a generic implementation of the old select() syscall, which expects
its argument in a memory block and switch all architectures over to use
it.
Signed-off-by: Christoph Hellwig <hch@lst.de >
Cc: Ralf Baechle <ralf@linux-mips.org >
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org >
Cc: Paul Mundt <lethal@linux-sh.org >
Cc: Jeff Dike <jdike@addtoit.com >
Cc: Hirokazu Takata <takata@linux-m32r.org >
Cc: Thomas Gleixner <tglx@linutronix.de >
Cc: Ingo Molnar <mingo@elte.hu >
Reviewed-by: H. Peter Anvin <hpa@zytor.com >
Cc: Al Viro <viro@zeniv.linux.org.uk >
Cc: Arnd Bergmann <arnd@arndb.de >
Cc: Heiko Carstens <heiko.carstens@de.ibm.com >
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com >
Cc: "Luck, Tony" <tony.luck@intel.com >
Cc: James Morris <jmorris@namei.org >
Acked-by: Andreas Schwab <schwab@linux-m68k.org >
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk >
Acked-by: Greg Ungerer <gerg@uclinux.org >
Acked-by: David Howells <dhowells@redhat.com >
Cc: Andreas Schwab <schwab@linux-m68k.org >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:32 -08:00
Joe Perches
724ee626f3
drivers/block/floppy.c: remove unnecessary casting in fd_ioctl
...
Convert outparam to const void *.
Cast outparam to const char * for strlen().
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
0aad92cfea
drivers/block/floppy.c: remove misleading, used once FD_IOCTL_ALLOWED macro
...
Just code the test directly
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
712e1de43e
drivers/block/floppy.c: remove obfuscating CODE2SIZE macro
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
ded2863d09
drivers/block/floppy.c: add __func__ to debugt
...
Make debugt messages a little neater.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
7f2527174a
drivers/block/floppy.c: convert raw_cmd_copyin from while(1) to label: goto
...
Reduces indent.
Makes a bit more readable and intelligible.
Return value now at bottom of function.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
ce2f11fe78
drivers/block/floppy.c: remove some unnecessary casting
...
Remove char/void __user * use.
Remove kmalloc cast.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
1ebddd85a6
drivers/block/floppy.c: use %pf in logging messages
...
Print the function name not the pointer address where useful and possible
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
275176bc2a
drivers/block/floppy.c: use __func__ where appropriate
...
Add and use __func__ to is_alive.
Use __func__ in some DPRINTs.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
891eda80a5
drivers/block/floppy.c: DPRINT neatening
...
Move DPRINT macro definition above 1st use Consolidate a format string
(>80 columns) Add a newline to an unterminated message Comment neatened
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
1a23d13335
drivers/block/floppy.c: remove #define FLOPPY_SANITY_CHECK
...
The code could not be compiled without the #define, so just remove it and
the #ifdef/#endif lines.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
73507e6cd8
drivers/block/floppy.c: remove unnecessary argument from [__]reschedule_timeout
...
Prior to patch "drivers/block/floppy.c: Use pr_<level>" only
reschedule_timeout(,"request done"...) printed a numeric value after a
reschedule_timeout event message.
Restore that behavior and remove the now unnecessary argument.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
0da3132f90
drivers/block/floppy.c: unclutter redo_fd_request logic
...
Change for(;;) with continue; to label: goto label
Reduces indentation and adds a bit of clarity.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:31 -08:00
Joe Perches
416d8d2888
drivers/block/floppy.c: remove REPEAT macro
...
Macros with hidden flow changes aren't nice.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
15b2630c58
drivers/block/floppy.c: remove unnecessary return and braces
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
57584c5a38
drivers/block/floppy.c: add function is_ready_state
...
Used a couple of times, might simplify the code a bit.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
29f1c7848f
drivers/block/floppy.c: convert int initialising to bool initialized
...
Don't initialize initialized either. Default is false.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
4d18ef09df
drivers/block/floppy.c: remove #define DEVICE_NAME "floppy"
...
Use it directly in the one place it's used.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
c529730a98
drivers/block/floppy.c: move leading && and || to preceding line
...
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
74f63f469e
drivers/block/floppy.c: convert int 1/0 to bool true/false
...
Various functions use int where bool is appropriate
lock_fdc, wait_til_done, poll_drive, user_reset_fdc
Convert to bool.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00
Joe Perches
55eee80c62
drivers/block/floppy.c: remove macros CALL, WAIT and IWAIT
...
Obfuscating macros with embedded returns are not nice
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Stephen Hemminger <shemminger@vyatta.com >
Cc: Jens Axboe <jens.axboe@oracle.com >
Cc: Marcin Slusarz <marcin.slusarz@gmail.com >
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2010-03-12 15:52:30 -08:00