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

Patch from Michal Rokos

proc_pccard is declared twice, so remove the first declaration such
that it is only in ifdef CONFIG_PROC_FS block.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Patch from Adrian Bunk

Since there's no user outside this file, cardbus_type in
drivers/pcmcia/yenta_socket.c can be made static.

Signed-off-by: Adrian Bunk
Signed-off-by: Russell King

Use msleep() instead of schedule_timeout() to guarantee the
task delays as expected.

Signed-off-by: Nishanth Aravamudan
Signed-off-by: Maximilian Attems
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

usb_early_handoff is referenced from __devinit and hence should be
__devinitdata.
Acked-by: Greg Kroah-Hartman <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

here is a fix to a previous ChangeSet from John; 32-bit emulation of flock(fd,
F_GETLK, &lock) currently is broken.

The ChangeSet:
http://linux.bkbits.net:8080/linux-2.5/cset%404152257aJKu1UClRcfvhsK6IjGYSeQ?nav=index.html|ChangeSet@-12w
from John Engel <jhe@us.ibm.com> fixes an off-by-one error and according
to the ChangeSet comment, it also contains a fix to handle l_len < 0 which
is now defined in POSIX 1003.1-2001 from the fcntl man page.

Gordon Jin <gordon.jin@intel.com> reports that the added test causes
compat_sys_fcntl[64] to fail: If fcntl(fd, F_GETLK, &lock) finds no
conflicting lock it sets l_whence to F_UNLCK, leaves all the other fields
unchanged, and returns 0.  The (f.l_start < 0) test wrongly converts this
to an EINVAL result.

The underlying sys_fcntl function which compat_sys_fcntl and
compat_sys_fcntl64 invoke already handles POSIX behavior correctly.  The
additional tests in the compat wrappers are not needed.

Here is a test case; its expected result is:

PASS
get flock: l_type=1, l_whence=0, l_start=145, l_len=10

#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
#include <stdio.h>

int
main(int argc, char *argv[])
{
    int fd;
    struct flock fl;
    char buf[255];

    fl.l_type = F_WRLCK;
    fl.l_whence = SEEK_END;
    fl.l_start = -100;
    fl.l_len = -10;
    /*
    fl.l_whence = SEEK_SET;
    fl.l_start = 100;
    fl.l_len = 10;
    */

    switch(fork()) {
	case -1:
	    perror("fork");
	    exit(-1);

	case 0:
	    fd = open("/tmp/testfile", O_RDWR|O_CREAT, 0600);
	    if (fd == -1) {
		perror("open");
		exit(-1);
	    }

	    if (write(fd, buf, 255) == -1) {
		perror("write");
		exit(-1);
	    }
	    if (fcntl(fd, F_SETLK, &fl) == -1) {
		perror("F_SETLK");
		exit(-1);
	    }
	    sleep(2);
	    break;

	default:
	    sleep(1);
	    fd = open("/tmp/testfile", O_RDWR|O_CREAT, 0600);
	    if (fd == -1) {
		perror("open");
		exit(-1);
	    }

	    if (fcntl(fd, F_SETLK, &fl) != -1 || errno != EAGAIN) {
		perror("F_SETLK");
		exit(1);
	    }

	    fl.l_type = F_WRLCK;
	    /*
	    fl.l_whence = SEEK_SET;
	    fl.l_start = 0;
	    fl.l_len = 0;
	    */
	    if (fcntl(fd, F_GETLK, &fl) == -1) {
		perror("F_GETLK");
		printf("FAIL\n");
		exit(-1);
	    }
	    printf("PASS\n");
	    printf("get flock: l_type=%d, l_whence=%d, l_start=%zd, "
	    	   "l_len=%zd\n", fl.l_type, fl.l_whence,
		   (size_t) fl.l_start, (size_t) fl.l_len);
	    break;
    }
    exit(0);
}
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We ended up adding this patch twice.

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

 * s_4bri.c has a nasty typo - bogus & in qBri_cpu_trapped().

   We have
	void *base;
   followed by
	regs[0] = READ_DWORD((&base + offset) + 0x70);

   which is *NOT* what is meant there - instead of access to memory
   pointed to by base we get access to _stack_ at some offset from the
   place where the local variable base lives.
Signed-off-by: Armin Schindler <armin@melware.de>
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 * new helpers - READ_BYTE() and WRITE_BYTE().  On Linux they are
   needed, since direct access to iomem pointers is not allowed (and
   does not work on some architectures).
 * memcpy() to/from iomem is not allowed on Linux (same story).

Proper primitives are memcpy_toio() and memcpy_fromio().  Several places
misused memcpy(); switched to memcpy_{to,from}io().
Signed-off-by: Armin Schindler <armin@melware.de>
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 * added __iomem to declarations of iomem pointers
Signed-off-by: Armin Schindler <armin@melware.de>
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 * adds new helpers ({GET,PUT}_{WORD,DWORD}) parallel to READ_WORD
   et.al., but used on normal memory instead of iomem.  Instances of
   READ_WORD and friends that are applied to vmalloc'ed memory and local
   variables switched to new helpers.
Signed-off-by: Armin Schindler <armin@melware.de>
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

trivial iomem annotations
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

fixed leaks on failure exits in ->probe()

assorted 64bit issues - extraction of number passed in pointer, use of
%zd for size_t, ssize_t instead of int as return value of ->read(), %p
for pointers instead of casting to int and using %x.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

partially annotated
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

 * 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>

Some laptops, notably IBM T22, refuse to suspend when the Cardbus
bridge is placed into D3.  Therefore, comment out the call for the
time being.

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>