mace and bmac are only used in "oldworld" PowerMacs.
Mark them as ppc32 only.

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

into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

 
  
The SGI Altix PROM supports a SAL call for performance monitoring and for
exporting NUMA topology. We need this in community kernels for diagnostic
and performance tools to use, especially on very large machines.

This patch registers a dynamic misc device "sn_hwperf" that supports an
ioctl interface for reading/writing memory mapped registers on Altix
nodes and routers via the new SAL call. It also creates a read-only
procfs file "/proc/sgi_sn/sn_topology" to export NUMA topology and Altix
hardware inventory.

> What tools are using this?
 
Performance Co-Pilot http://oss.sgi.com/projects/pcp  in particular,
pmshub, shubstats and linkstat. Numerous other users include anything
that needs knowledge of numa topology/interconnect in order to perform
well, e.g. mpt. BTW I have not exported any API functions .. at this
point I don't think we need any modules to call the API.
Signed-off-by: Mark Goodwin <markgw@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

into agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

Mark Goodwin suggested that we document our platform a bit.  This patch adds
help text for the sn2 specific kernel option.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

r.k[56] used to contain physical addresses but now contain virtual
addresses.  There are code remnants which still believe that they are
physical and "convert" ar.k[56] to virtual.  This breaks when current
is not in region 7 (e.g. the idle task on cpu 0).
Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

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

Signed-off-by: Bart De Schuymer <bdschuym@pandora.be>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

Fixes slab corruption in cbq_destroy. cbq_destroy_filters and
qdisc_put_rtab(q->link.R_tab) are already called in cbq_destroy_class.
The latter lead to a slab corruption due to repeated freeing of
q->link.R_tab because q->link is part of q->classes. Problem introduced
in 1.21.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

This patch adds DSCP decapsulation for IPsec.  This is enabled by
a per-state flag which is off by default.  Leaving it off by default
maintains compatibility and is also good for performance reasons.

I decided to not implement a toggle on the output path since not
encapsulating the DSCP can and should be done by netfilter.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

This patch kills the duplicate implementation of ip6_get_dsfield in
inet_ecn.h.  It now uses ipv6_get_dsfield from dsfield.h instead.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

When sending NA in response to NS, we may not know the 
link-layer address for the destination of the NA 
since unicast NS is not required to include its link-layer information.
In this case, we first need to resolve the link-layer address.
(RFC 2461 7.2.4)

We now create neighbour entry for the destination 
and link-layer information will be automatically solved 
in the output path.
Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Eric Lemoine <eric.lemoine@gmail.com>
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

The compiler has no way of knowing whether nentries will be greater than 0, so
it was generating a warning that qw might be used uninitialized.  Fix it by
explicitly setting it to 0.  Cc'ing Brian in case he has an internal version
he'd like to keep in sync.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

* 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 agluck-lia64.sc.intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.9

current can be in region 5, use 'tpa' to convert to physical
Signed-off-by: Tony Luck <tony.luck@intel.com>

Kill fn_key_eq and fn_key_leq
Signed-off-by: David S. Miller <davem@davemloft.net>

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

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

1) Kill special key, prefix, and hash index types.
   They make the code less readable and maintainable.
2) __inline__ --> inline
Signed-off-by: David S. Miller <davem@davemloft.net>

Bug noticed by Ysauyuki Kozakai.
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Eric Lemoine <eric.lemoine@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Using tx_lock in SunGEM makes the driver logic in conformance
with tg3 and e1000, easing maintainance.
Signed-off-by: Eric Lemoine <eric.lemoine@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

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>