This is a bug fix for a flawed patch I put in lk 2.4.19
(sg version 3.1.24) and has been carried through into
the 2.5 series. Thanks to Andy Polyakov
<appro@fy.chalmers.se> for pointing this out (more than once).

The sg.h header didn't get updated last time I submitted
an sg patch so this patch also addresses that.

into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

From: Herbert Xu <herbert@gondor.apana.org.au>

This patch adds a pair of missing quotes.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

If writev() is passed a vector in which the second or later segment generates
a fault it will currently return -EFAULT.

It shouldn't.  It should write what it can and return the number of bytes
which were successfully copied.

Fix that up by writing the partial result and then returning the right value.

From: Neil Brown <neilb@cse.unsw.edu.au>

Extract ->stamp from skb *before* freeing it in svcsock.c

As we sometime copy and free an skb, and sometime us it in-place, we must
be careful to extract information from it *before* it might be freed, not
after.

Manfred's page-unmapping debug patch found this one.

From: Jes Sorensen <jes@wildopensource.com>

This is patch which provides support for 64 bit address allocations from
pci_alloc_consistent(), based on the address mask set through
pci_set_consistent_dma_mask().  This is necessary on some platforms which
are unable to provide physical memory in the lower 4GB block and do not
provide IOMMU support for cards operating in certain bus modes, such as
PCI-X on the SGI SN2.

The default mask for pci_alloc_consistent() is still 32 bit as there are 64
bit capable hardware out there that doesn't support 64 bit addresses for
descripters etc.  Likewise, platforms which provide IOMMU support in all
bus modes can ignore struct pci_dev->consistent_dma_mask and just return a
32 bit address as before.

The patch also includes changes to tg3.c to make it use the new api as well
as a documentation update.  I have done my best on the documentation part,
if anyone feel the can make my scribbles clearer, please do.

Thanks to Dave Miller, Grant Grundler, James Bottomley, Colin Ngam, and
Jeremy Higdon for input and code/documentation portions.

Replace

	rtnl_lock();
	register_netdevice(dev);
	rtnl_unlock();

with the equivalent

	register_netdev();

in numerous places.

The NR_OPEN check in F_DUPFD is unneeded.  viro says:

"We check the limits in locate_fd() (called by dupfd()).  Check for NR_OPEN
can (and should) be dropped - locate_fd() will never go beyond that
(expand_fd() will check it and refuse to go).

"IOW, simply lose the check.  We _might_ want to check signedness, but that's
it (IOW, check that arg will fit into 0..MAX_INT; second argument of dupfd()
is an int).  OTOH, we might actually make dupfd() et.al.  take unsigned long
and kill that crap completely."

And indeed, the signedness is suspicious, so make various things in there
unsigned too.

I'm not sure why I used igrab() in unlink().  igrab takes the oft-taken
inode_lock.

The caller has a ref, so a simple increment of i_count will suffice.

- set the number of pages to be written to "1".

- Don't test PG_writeback twice.

From: Andy Whitcroft <apw@shadowen.org>

There's a spot in i2o where we deliberately leak some memory when the
hardware plays up.  The alternative is to let the hardware scribble on it at
some unknown time in the future.

Things like the Stanford checker keep alleging that this is a bug.  So shut
them up with a comment

All we're doing in there is writing things into the inode.  I see no need for
the lock_kernel().

And holding lock_kernel() across mark_inode_dirty() hurts on big SMP.

From: Andi Kleen <ak@suse.de>

The logic is: the global variable is set to the magic value
IRQBALANCE_CHECK_ARCH.  It can be overwritten by a __setup function.  If
the magic value is still set when the irq balancer is started it asks the
subarchitecture using the NO_BALANCE_IRQ macro.  This is defined to a
genapic field in the generic architecture, otherwise constant.  Then the
global variable is set and when it is true no balancing happens.

Previously I had this wrong in that it always disabled it.

This part should be correct, but it still doesn't seem to work.

(I left the printk in there until the problem is debugged, could be removed
of course)

From: Hollis Blanchard <hollis@austin.ibm.com>

Fix a user pointer deref, found by the Stanford checker.

From: Manfred Spraul <manfred@colorfullife.com>

three build fixes for CONFIG_PROC_FS=n:

include/linux/procfs.h:

 - add missing proc_pid_unhash, proc_pid_flush declarations.  static
   inline functions that do nothing.

 - move semicolons around for kclist_{add,del}.  gcc-3.2.2 doesn't like
   the current syntax.

drivers/net/pppoe.c:

 - proc_net doesn't exist if CONFIG_PROC_FS=n.

drivers/scsi/scsi_priv.h:

 - add missing brackets to macro definition.

From: Andrey Panin <pazke@donpac.ru>

This small patch (against 2.5.70) updates visws_apic.c in accordance
with linux irq handling changes.

From: Jan Marek <linux@hazard.jcu.cz>

The DRM modules (i810) need this symbol.

As this is a special-case for one particular in-kernel module I changed Jan's
patch from EXPORT_SYMBOL to EXPORT_SYMBOL_GPL.

From: Milton Miller <miltonm@bga.com>

mm is NULL for kernel threads without their own context.  active_mm is
maintained the one we lazly switch from.

Without this patch, apm bios initiated suspend events (eg panel close)
cause an oops on resume in the LDT restore, killing kapmd, which causes
further events to not be polled.

From: Pavel Machek <pavel@ucw.cz>

This fixes suspend when pccards are used...

We want an "|" in there, not "||".

into kernel.bkbits.net:/home/davem/sparc-2.5

into kernel.bkbits.net:/home/davem/net-2.5

The m68knommu/pilot startup code is not copying the init segment to
RAM currently. Fix it to copy all of the data and init sections to RAM.

Support pre-configured boot arguments on m68knommu/5206e targets.

Support pre-configured boot arguments on m68knommu/5206 targets.

Make the ROMfs copy in the startup code for ARNEWSH/5260 board
conditional on actually using a ROMfs setup.

(i.e. the better fix)

into redhat.com:/garz/repo/net-drivers-2.5

The needed fix winds up breaking SG, checksumming, and other stuff
in the process.

into kernel.bkbits.net:/home/davem/net-2.5

A couple of bugs in netdev_unregister_sysfs; still working on the harder
refcount issues.
- if driver sets get_stats after register then unregister 
  will attempt to delete kobject that has not be initialized.
- unregister should call kobject_unregister not kobject_del.

cleanup's:
- use strlcpy instead of snprintf
- don't need to memset the stats kobject

Ouch.