* annotations for sparc io.h
 * missing memcpy_toio()/memcpy_fromio() added
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Nicolas Pitre

This is preemption unsafe and rather not pretty.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King

Patch from Christoph Hellwig

These routine in arm is unused (in fact not even compiled).

Instead of converting it to local_softirq_pending I'd suggest just
removing it as below as it's been there totally unused for a long
time.

The special non-signalling NaN flag was escaping and setting some
FPSCR exception enable flags.  Ensure that this flag is masked out
before we update the FPSCR.

Clean up sparse warnings in rtctime.c and netwinder-hw.c

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

The fix for SELinux w/SOCK_SEQPACKET had an error,
noted by Alan Cox.  This fixes it.
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

I cross-checked the functions called by the BUILD_INTERRUPT macros and
came up with this patch.  Even though some of these functions currently 
take no args I made them all consistent.  Some functions in the Voyager 
code that are not directly called from asm code become static.
Signed-off-by: Brian Gerst <bgerst@didntduck.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Return 0 from queuecommand, if the command has been completed already.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

If the command is already completed, megaraid_queue_command() must
return 0.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

aac_read() and aac_write() may complete a command but return -1, which
is propagated through aac_scsi_cmd() to the mid layer through
->queuecommand. If the command has been completed, it must return 0.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

The driver appropriately returns SCSI_MLQUEUE_HOST_BUSY, but it has
already completed the command. Just return 0 instead and let the mid
layer handle it through scsi_done().
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

One more case of returning non-zero with a completed command.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

In case of scb allocation failure, mega_build_cmd() can return NULL scb
but set busy, which causes a non-zero return from ->queuecommand() while
the scsi command has been completed.   Just returning busy without calling
done() should be enough for appropriate retries.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

ide-scsi completes a command but returns ownership to the mid layer.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

If your ->queuecommand() completes a command through done, it must not
return non-zero to the mid layer so that it takes ownership of the
command again.
Signed-off-by: Jens Axboe <axboe@suse.de>

corrected typo
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Increase time fallback threshold

Otherwise ACPI triggers it too often.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix early oopses

Without this very early oopses crash recursively while trying
to figure out the current CPU number.

Based on a patch by James Cleverdon.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix interaction between nosmp and pcibios_fixup_irqs().

Originally from Oleg Nesterov via i386

   When we boot with nosmp we dont have all the mptable info, so
   IO_APIC_get_PCI_irq_vector() doesnt work and devices just end up getting a
   wrong interrupt.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix incorrect alignment in the vsyscall variables that caused
vsyscalls to be completely broken.

This change should decrease system time during TPC-* tests
considerably.

Clean up the vmlinux.lds to make it easier readable

Do some cleanups in the vsyscall code. 

Align cacheline_aligned correctly on 128 byte cacheline systems.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

And I didn't feel a thing.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Attached patch adds missing DQUOT_OFF to the umount path of the root
filesystem (it is only remounted read-only and so the usual path with
DQUOT_OFF is not taken).
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Change inequalities for deciding when a user has cleaned up enough space to
be below softlimit to match the ones for deciding when the softlimit has
been exceeded.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The patches attached here fixes the BUG #3758 - "Broken symlinks on smbfs
with 2.6.10-rc[12]".  There are two patches, one to be applied over version
2.6.9 and the other over 2.6.10-rc2.

The old utilities (and the old driver) uses uid=0, gid=0, dmask=0 and
fmask=0 to flag the lack of this parameters on the mount command line.
When the user do not specify the uid, gid, fmask or dmask, the current
driver will assign gid=root, gid=root, dmask=755, fmask=755.  This behavior
is similar to the old 2.x samba versions.

To make the driver see the permissions and ownership assigned on the
server, "smbmount" and "smbmnt" utilities must be patched.  The patches is
already available on the attached patches at Bug #3330 or Samba Bug #999.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

<linux/mount.h> uses atomic_t and spinlock_t, but doesn't include either
<asm/atomic.h> or <linux/spinlock.h>, which means that any users of
<linux/mount.h> have to include them.  This patch adds the necessary
#includes to avoid this.
Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

There's not much value in shipping Changelogs that weren't updated since at
least 2.4.0.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Acked-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The kernel parameter "nohighio" seems to be gone in the code, but the
parameter is still left in the documentation.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Problem identified by Jan Kasprzak.

Limit on domainname_max (currently 50) is too small.

Just use the beginning of input buffer as scratch space for it, and save a
little stack space while we're at it.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch adds LOG_SENSE as a read-ok command.  cdrecord-prodvd uses this.
 I also added LOG_SELECT as write-ok as this seems to fit in as well.
Signed-off-by: Daniel Drake <dsd@gentoo.org>
Acked-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Looking at  get_task_comm patch:
http://linus.bkbits.net:8080/linux-2.5/patch@1.1803.144.3

There is one other place where task->comm is accessed outside current.
There are two issues.  The code is trying to copy to temp space without
task_lock.  It is not using temp space for actual user copy.

Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch replaces MODULE_PARM to module_param for adt746x.
Signed-off-by: Colin Leroy <colin@colino.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Uninlining do_trap() saves 544 bytes in traps.o.  get_cr2() seems to be
unused, remove it.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The sonypi_camera_command() used to fail without returning an error code if
the user fergot to enable the camera in the sonypi module (using the
camera=1 module parameter).  This caused the meye driver to apparently load
correctly but miserably fail later, when trying to access the camera for
getting some data out of it.

This patch adds an error code to sonypi_camera_command() and makes the meye
driver check for it in the PCI probe routine.  If the function fails, a
message is printed in the kernel logs reminding the user it should better
RTFM.

The patch also removes some sonypi_camera_command() commands (those
supposed to return the current camera settings) which are unreliable.  The
meye driver does not use them anyway.
Signed-off-by: Stelian Pop <stelian@popies.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Heiko Carstens <heiko.carstens@de.ibm.com>

Remove the disputed hba api event callback code.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>