From: Magnus Damm <magnus.damm@gmail.com>

This simple patch changes the output from this:
..
ide_setup: ide=nodmaIDE: Prevented DMA
..
to this:
..
ide_setup: ide=nodma : Prevented DMA
..
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Magnus Damm <magnus.damm@gmail.com>

This patch removes ide parameters marked as obsolete in the source and
adds documentation for "ide=". I think I got it right, the important
part for me is "ide=nodma".
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Mikael Starvik <starvik@axis.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

When I switched my installation from kernel 2.4 to 2.6 I recognized that
the ISDN module dss1_divert was marked incompilable (config option
CONFIG_CLEAN_COMPILE must be turned off). 

The compile problem was the obsolete using of kernel 2.4 critical
sections.  I replaced the cli() stuff with spinlocks as explained in the
Documentation/spinlocks.txt file.  After that the module compiles and
runs as expected. 
Signed-off-by: Steffen A. Mork <linux-dev@morknet.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

quirk_via_irqpic cannot be __devinit because it runs at
pci_enable_device() time now.

This fixes a boot time crash on a VIA x86-64 machine.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Signed-off-by: David S. Miller <davem@davemloft.net>

Use VM_RESERVED instead.
Signed-off-by: David S. Miller <davem@davemloft.net>

1) BUG on presence of existing mappings just
   as remap_pfn_range does
2) Perform TLB flush while holding page_table_lock
Signed-off-by: David S. Miller <davem@davemloft.net>

1) Use in_atomic() for atomicity check.
2) Add mmap_sem deadlock on bad kernel access
   prevention just as on i386
3) Use VM_FAULT_* macros instead of magic constants.
Signed-off-by: David S. Miller <davem@davemloft.net>

into nuts.davemloft.net:/disk1/BK/sparc-2.6

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

Patch from Ben Dooks

Correct the name used when registering the system
tick interrupt from S32410 to S3C2410.

Signed-off-by: Dimitry Andric

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Ben Dooks

Add patch that should have been in 2247/1, defining
CONFIG_S3C2410_LOWLEVEL_UART_PORT

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

It's possible for do_brk() to fail during set_brk() when exec'ing and
a.out.  This was noted with Florian's a.out binary and overcommit set to
0. 

Capture this error and terminate properly.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Florian Heinz built an a.out binary that could map bss from 0x0 to
0xc0000000, and setup_arg_pages() would be unhappt in insert_vma_struct
because the arg pages overlapped.  This just checks before inserting,
and bails out if it would overlap.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jakub Jelinek points out that current fix has an underflow problem
if elf_ppnt->p_filesz == 0.  Fix that up, and also stop overwriting
interpreter buffer, simply check that it's NULL-terminated.

From: Jakub Jelinek <jakub@redhat.com>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

The patch below makes the following cleanups for code under drivers/mtd/ :
- make some needlessly global code static
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

fs/jffs2/gc.c:832: warning: signed size_t format, different type arg 
(arg 3)
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

... and should include it directly rather than hoping it's been done.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

We had it already in the inocache structure we were being passed
Signed-off-by: Artem Bityuckiy <dedekind@infradead.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

We weren't correctly holding a lock when adding raw nodes to the 
per-inode list.
Signed-off-by: Artem Bityuckiy <dedekind@infradead.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Determine it from the CFI query data instead of hard-coding it.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: David Woodhouse <dwmw2@infradead.org> 

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: Pete Popov <ppopov@embeddedalley.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Fix kernel NULL pointer dereference at mtd_erase_callback+6 when trying
to insmod INFTL or NFTL modules.
Signed-off-by: Kalev Lember <kalev@colleduc.ee>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

We weren't correctly resetting our idea of the chip's state on suspend
in all circumstances. Fix that.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Cleanups and fixes in preparation for XIP support -- fix unbalanced use
of get_chip() and put_chip(), and clean up the code a little in 
preparation for what's to come.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Originally from Joe Perches <joe@perches.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

The attached patch fixes the fork fix to avoid the divide-by-zero error I'd
previously fixed, but without using any sort of conditional.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

If the drain flag is set on the queue, get_request() needs to drop the
acquired iocontext to avoid leaks.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>