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

Fix a goofup from the recent sort consolidation patches.

- Subtractions in comparison functions could overflow the return type for
  64-bit pointers.  Make it right again.

- Add missing size arg to ia64 extable swap function.
Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch fixes a bug with the recently added printk-times feature.

In the case where a printk consists of only the log level (followed
subsequently by printks with more text for the same line), the printk-times
code doesn't correctly recognize the end of the string, and starts emitting
chars at the 0 byte at the end of the string.

The patch below fixes this problem.  It also adjusts the handling of
printed_len in the routine, which was affected by the printk-times feature.
Signed-off-by: Tim Bird <tim.bird@am.sony.com>
Acked-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch updates the sungem driver. I reworked all of the PM stuff, making it
less prone to races, probably simpler to read as well, and I no longer shut the
PHY down when the interface is down so that things like laptop-net no longer
die (the gain in power consumption was minimal, not worth the pain). I also
implemented basic WOL support.

There is still something I'm not totally happy with in the locking
(explained in the comment at the beginning), basically too much locking and a
couple of places with delays in locks. I will try to improve these later on.

It also adds a fix for a MAC reset issue when the receiver gets stuck.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Christophe Lucas <c.lucas@ifrance.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Moving nr_init_timers prototype to where all the other prototypes
already are.
Signed-off-by: David S. Miller <davem@davemloft.net>

ROSE wasn't verifying the ndigis argument of a new route resulting in a
minor security hole.
Signed-off-by: David S. Miller <davem@davemloft.net>

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

this patch correctly removes the pci_find_device() used by the fore200e
driver.  the __init/__exit remains a bit clunky since we need to preserve
sbus support.
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Otherwise declarations for disable_irq()/enable_irq() will
not be obtained on platforms not doing CONFIG_GENERIC_HARDIRQS.
Signed-off-by: David S. Miller <davem@davemloft.net>

This check is wrong, gcc optimizes it away:

                if ((len -= sizeof(pi)) > len)
			return -EINVAL;

This could be responsible for the BUG. If len is 2 or 3 and TUN_NO_PI
isn't set it underflows. alloc_skb() allocates len + 2, which is 0 or
1 byte. skb_reserve tries to reserve 2 bytes and things explode in
skb_put.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

This patch adds AGP support for the U3 northbridge used in Apple G5
machines to drivers/char/agp/uninorth-agp.c.  This patch is based on
earlier work by Jerome Glisse.  With this patch, the driver works in
both ppc32 and ppc64 kernels.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Otherwise declarations for disable_irq()/enable_irq() will
not be obtained on platforms not doing CONFIG_GENERIC_HARDIRQS.
Signed-off-by: David S. Miller <davem@davemloft.net>

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

Cacheing the current position reduces complexity from O(n^2)
to O(n).
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

Low level optimization of the comparison with zero address.
On most cpu's faster to use unrolled or rather than a loop
and memcmp. This is in the fastpath of bridge forwarding.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Optimize bridge forwarding table for the fastpath of updating
an existing entry. Use RCU to find the entry and change it's time.
Fallback to normal locking for insert. This gives about a 1/3
improvement in packets forwarding per second on SMP.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

For 2.6, I changed the bridge forwarding table timeout code to keep
a threaded list of in order entries. Well, it turns out that this is
a performance hit because we end up constantly moving entries around
in the list.  Later patch changes this to be in place update with RCU.

This version just uses a 100ms garbage collection timer.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Get rid of unneeded include.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Replace the existing mac hash in the bridge code with the nice
inline jenkins hash. This should provide better distribution across
hash buckets and compiles to code that is similar in complexity.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

The tc_u32_mark structure is used as part of the netlink message
from the user API to the kernel, so it needs to be moved to
include/linux/pkt_cls.h and have types changed from u32 to __u32.

Also, the definition of u32 performance counters doesn't need to depend
on the config option.  The definition can exist even if the code isn't
enabled.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Paul Mackerras points out that the pci_get_class() call will
properly put away the old PCI device. Blush.

Trivial reordering of netdevice structure to save four bytes.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Patrick McHardy <kaber@trash.net>

Signed-off-by: Neil Horman <nhorman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Scott Feldman <sfeldma@pobox.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

Never called AFAICS, and only assigned -- to a no-op stub -- in
one driver.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

As promised here is the patch that moves dst_release out of
dst->ops->check.  It bloats sk_dst_check/__sk_dst_check slightly
but they're only used in a handful of places so it isn't too bad.
I actually counted, it's about a few hundred bytes.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

There are other bogosities in drivers/char/agp/generic.c.  I can't
believe Dave ever tested that code with an AGP 3.0 device.  If you pass
in a mode that has the AGP 3.0 bit set, agp_v3_parse_one() will first
clear that bit (and print a message), and then complain because you
haven't got that bit set in the mode, with a message that the caller is
broken.  Furthermore, if the mode passed in has both the 4x and 8x bits
set, the new code will give you 4x where the old code would give you 8x
(which is what the caller wanted).

The patch below fixes this.  It will work in the 99.99% of cases where
we have one AGP bridge and one AGP video card.  We should eventually
cope with multiple AGP bridges, but doing the matching of bridges to
video cards is a hard problem because the video card is not necessarily
a child or sibling of the PCI device that we use for controlling the AGP
bridge.  I think we need to see an actual example of a system with
multiple AGP bridges first.

Oh, and by the way, I have 3D working relatively well on my G5 with a
64-bit kernel (and 32-bit X server and clients), which is why I care
about AGP 3.0 support.  :)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The previous revert needed some more work to make it actually work.

Tunnel mode packets are rerouted if the tunnel destination
address is different from the original destination address,
otherwise the old route is used. This is inconsistent, the
old route might have been selected for a given output device
or using routing by tos/fwmark. Always choose a new route
in tunnel mode.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

	<Patch from Adrian Bunk>
make needlessly global code static
remove unneeded EXPORT_SYMBOL's from irport.c
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

cleanup some construct obsoleted by Linus's patch
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

	<Original patch from Steffen Pingel>
support NSC PC8738x chipset (IBM x40 & ...)
Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>