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

Alan suggested using __set_current_state as being more correct for
the DRM so do that.
Signed-off-by: Dave Airlie <airlied@linux.ie>

Suggested-by: Nishanth Aravamudan <nacc@us.ibm.com>
Approved-by: Dave Airlie <airlied@linux.ie>

Add pci_enable_device for any PCI device we want to use.

From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Approved-by: David Airlie <airlied@linux.ie>

This caused issues with a PCI radeon card.

From: Jon Smirl
Approved-by: Dave Airlie <airlied@linux.ie>

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

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

Allocating the 'struct linux_binprm' on the stack chews up too much
stackspace.

Just kmalloc it instead.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into pobox.com:/spare/repo/libata-2.6

* address race condition WRT order of DMA-start and ATA command issue
  (see code comment for more details)

* Add support for Frodo 4/8

Noticed by BenH, happily harmless (nothing that uses that
code has been committed yet, and PIO seems to be pretty much
unused on at least the Apple G5 machines: all the normal
hardware is set up purely for MMIO, to the point that I
couldn't even test this thing).

Things like SATA use this for data transfer.

Also export the iomap routines on ppc64.

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

 PXA2xx

Patch from Nicolas Pitre

Let's make sure OSCR doesn't end up to be restored with a value
past OSMR0 otherwise the system timer won't start ticking until
OSCR wraps around (aprox 17 min.

Also set OSCR _after_ OIER is restored to avoid matching when
corresponding match interrupt is masked out.

Signed-off-by: Nicolas Pitre 

Only the EEH case (pSeries) handled for now. 

The two current_menu variables are really two separate variables, so keep
them separate.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This makes OProgile use get_task_mm() as discussed.  It also fixes up
Anton's previous patch.  Zwane's soaked this patch all night w/o
problems.

I'm a retard.

Nicolas Boichat reports that his monitor needs the slower
i2c bus timings. These values also match atyfb and the
original ones.

It would clear the segment registers in the parent, which
wasn't really intentional. Noticed by Andries Brouwer.

The final ia64 related cleanup to elf_read_implies_exec() seems to have
broken it.  The effect is that the READ_IMPLIES_EXEC flag is never set
for !pt_gnu_stack binaries!

That's a bit more secure than we need to be, and might break some legacy
app that doesn't expect it.

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

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

Fix ABI in set_mempolicy() that got broken by an earlier change.

Add a check for very big input values and prevent excessive looping in the
kernel.

Cc: Paul "nyer, nyer, your mother wears combat boots!" Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Patch from Ben Dooks

Removed resource description left by copying error

Thanks to Klaus Fetscher for pointing this out.

Signed-off-by: Ben Dooks 

Correct wrong ip header in netpoll_send_udp.
Signed-off-by: Duncan Sands <baldrick@free.fr>
Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

As it's using the obsolete MOD_{INC,DEC}_USE_COUNT it's implicitly locked
already, but let's remove them and make it explicit so these macros can go
away completely without breaking m68k compile.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

<asm/softirq.h> went away in 2.5, but new ports keep adding instances again
and again.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

NetBSD allows 16 partitions, not just 8.  This patch both ups the number,
and makes the recognition code tell you if the count in the disklabel
exceeds the number supported by the kernel.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- I misspelled CONFIG_PREEMPT CONFIG_PREEPT as various people noticed.
  But in fact that ifdef should just go, else we'll get drivers that
  compile with CONFIG_PREEMPT but not without sooner or later.

- remove unused hardirq_trylock and hardirq_endlock
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

err may be used uninitialized in mempolicy.c in both compat_set_mempolicy
and compat_mbind.  This patch fixes that by setting them both to 0.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

UARTS on several Intel IXP2000 systems are connected in such a way that
they can only be addressed using full word accesses instead of bytes.
Following patch adds a UPIO_MEM32 io-type to identify these UARTs.
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add a couple of missing cache flushes to the bouncing code.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Using CONFIG_UML_SMP and then making CONFIG_SMP = CONFIG_UML_SMP is useless
(there was a reason in 2.4, to have different help texts, but not now).
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>