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

This change switches matroxfb on x86 and x86_64 from dereferencing
pointers to {read,write}[bwl], as __pa() are gone from them, and so gcc
does not need an additional register for preserving address between
consecutive {read,write}[bwl].

Then it switches only supported architecture left (ppc/ppc64/arm) from
dereferencing pointers to __raw_{read,write}[bwl]. 

Third part is fixing sparse complaints: add __iomem here and there, and
switch one 1bit bitfield from int to unsigned int. 

After this there should be no sparse complaints in matroxfb.
Signed-off-by: Petr Vandrovec <vandrove@vc.cvut.cz>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Looks like a couple struct to pointer conversions were missed.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

FTP NAT module doesn't register anything with no args.  Oops.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

As I explained in the waitid patches, I added the si_rusage field to
siginfo_t with the idea of having the siginfo_t waitid fills in contain all
the information that wait4 or any such call could ever tell you.  Nowhere
in POSIX nor anywhere else specifies this field in siginfo_t.  

When Ulrich and I hashed out the system call interface we wanted, we looked
at siginfo_t and decided there was plenty of space to throw in si_rusage.
Well, it turns out we didn't check the 64-bit platforms.  There struct
rusage is ridiculously large (lots of longs for things that are never in a
million years going to hit 2^32), and my changes bumped up the size of
siginfo_t.  Changing that size is more trouble than it's worth.

This patch reverts the changes to the siginfo_t structure types,
and no longer provides the rusage details in SIGCHLD signal data.
Instead, I added a fifth argument to the waitid system call to fill in rusage.

waitid is the name of the POSIX function with four arguments.  It might
make sense to rename the system call `waitsys' to follow SGI's system call
with the same arguments, or `wait5' in the mindless tradition.  But, feh.
I just added the argument to sys_waitid, rather than worrying about
changing the name in all the tables (and choosing a new stupid name).
Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

* add dev_select hook, and default/noop implementations
* export ata_dev_classify
* fix a couple bugs that cropped up when building with
  ATA_VERBOSE_DEBUG
* export __sata_phy_reset, a variant that does not call
  ata_bus_reset

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>