14 years ago[PATCH] IB: sparse endianness cleanup
Sean Hefty [Sun, 14 Aug 2005 04:05:57 +0000]
[PATCH] IB: sparse endianness cleanup

Fix sparse warnings.  Use __be* where appropriate.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

14 years ago[PATCH] IB: Eliminate redundant NULL checks
Hal Rosenstock [Sun, 14 Aug 2005 03:50:27 +0000]
[PATCH] IB: Eliminate redundant NULL checks

IPoIB: Eliminate NULL checks prior to calling kfree

Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

14 years ago[PATCH] IB: Add copyright notices
Roland Dreier [Thu, 11 Aug 2005 06:03:10 +0000]
[PATCH] IB: Add copyright notices

Make some lawyers happy and add copyright notices for people who
forgot to include them when they actually touched the code.

Signed-off-by: Roland Dreier <rolandd@cisco.com>

14 years ago[PATCH] IB: Update current firmware versions in mthca driver
Tziporet Koren [Thu, 11 Aug 2005 06:00:50 +0000]
[PATCH] IB: Update current firmware versions in mthca driver

Update FW versions in mthca according to July 05 Mellanox release

Signed-off-by: Tziporet Koren <tziporet@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

14 years ago[PATCH] Fix oops in sysfs_hash_and_remove_file()
James Bottomley [Sat, 27 Aug 2005 01:34:17 +0000]
[PATCH] Fix oops in sysfs_hash_and_remove_file()

The problem arises if an entity in sysfs is created and removed without
ever having been made completely visible.  In SCSI this is triggered by
removing a device while it's initialising.

The problem appears to be that because it was never made visible in sysfs,
the sysfs dentry has a null d_inode which oopses when a reference is made
to it.  The solution is simply to check d_inode and assume the object was
never made visible (and thus doesn't need deleting) if it's NULL.

(akpm: possibly a stopgap for 2.6.13 scsi problems.  May not be the
long-term fix)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] md: clear the 'recovery' flags when starting an md array.
NeilBrown [Sat, 27 Aug 2005 01:34:16 +0000]
[PATCH] md: clear the 'recovery' flags when starting an md array.

It's possible for this to still have flags in it and a previous instance
has been stopped, and that confused the new array using the same mddev.

Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] md: create a MODULE_ALIAS for md corresponding to its block major number.
NeilBrown [Sat, 27 Aug 2005 01:34:15 +0000]
[PATCH] md: create a MODULE_ALIAS for md corresponding to its block major number.

I just discovered this is needed for module auto-loading.

Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] IB: fix use-after-free in user verbs cleanup
Roland Dreier [Sat, 27 Aug 2005 01:34:14 +0000]
[PATCH] IB: fix use-after-free in user verbs cleanup

Fix a use-after-free bug in userspace verbs cleanup: we can't touch
mr->device after we free mr by calling ib_dereg_mr().

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] arm: fix IXP4xx flash resource range
Deepak Saxena [Sat, 27 Aug 2005 01:34:11 +0000]
[PATCH] arm: fix IXP4xx flash resource range

We are currently reserving one byte more than actually needed by the flash
device and overlapping into the next I/O expansion bus window.  This a)
causes us to allocate an extra page of VM due to ARM ioremap() alignment
code and b) could cause problems if another driver tries to request the
next expansion bus window.

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] x86_64: Tell VM about holes in nodes
Andi Kleen [Sat, 27 Aug 2005 01:34:10 +0000]
[PATCH] x86_64: Tell VM about holes in nodes

Some nodes can have large holes on x86-64.

This fixes problems with the VM allowing too many dirty pages because it
overestimates the number of available RAM in a node.  In extreme cases you
can end up with all RAM filled with dirty pages which can lead to deadlocks
and other nasty behaviour.

This patch just tells the VM about the known holes from e820.  Reserved
(like the kernel text or mem_map) is still not taken into account, but that
should be only a few percent error now.

Small detail is that the flat setup uses the NUMA free_area_init_node() now
too because it offers more flexibility.

(akpm: lotsa thanks to Martin for working this problem out)

Cc: Martin Bligh <mbligh@mbligh.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] I2C hwmon: kfree fixes
Mark M. Hoffman [Sat, 27 Aug 2005 01:34:08 +0000]
[PATCH] I2C hwmon: kfree fixes

This patch fixes several instances of hwmon drivers kfree'ing the "wrong"
pointer; the existing code works somewhat by accident.

(akpm: plucked from Greg's queue based on lkml discussion.  Finishes off the
patch from Jon Corbet)

Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] ppc64: Fix issue with gcc 4.0 compiled kernels
Anton Blanchard [Sat, 27 Aug 2005 01:34:07 +0000]
[PATCH] ppc64: Fix issue with gcc 4.0 compiled kernels

I recently had a BUG_ON() go off spuriously on a gcc 4.0 compiled kernel.
It turns out gcc-4.0 was removing a sign extension while earlier gcc
versions would not.  Thinking this to be a compiler bug, I submitted a
report:

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23422

It turns out we need to cast the input in order to tell gcc to sign extend
it.

Thanks to Andrew Pinski for his help on this bug.

Signed-off-by: Anton Blanchard <anton@samba.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] completely disable cpu_exclusive sched domain
Paul Jackson [Thu, 25 Aug 2005 19:47:56 +0000]
[PATCH] completely disable cpu_exclusive sched domain

At the suggestion of Nick Piggin and Dinakar, totally disable
the facility to allow cpu_exclusive cpusets to define dynamic
sched domains in Linux 2.6.13, in order to avoid problems
first reported by John Hawkes (corrupt sched data structures
and kernel oops).

This has been built for ppc64, i386, ia64, x86_64, sparc, alpha.
It has been built, booted and tested for cpuset functionality
on an SN2 (ia64).

Dinakar or Nick - could you verify that it for sure does avoid
the problems Hawkes reported.  Hawkes is out of town, and I don't
have the recipe to reproduce what he found.

Signed-off-by: Paul Jackson <pj@sgi.com>
Acked-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] undo partial cpu_exclusive sched domain disabling
Paul Jackson [Thu, 25 Aug 2005 19:47:50 +0000]
[PATCH] undo partial cpu_exclusive sched domain disabling

The partial disabling of Dinakar's new facility to allow
cpu_exclusive cpusets to define dynamic sched domains
doesn't go far enough.  At the suggestion of Nick Piggin
and Dinakar, let us instead totally disable this facility
for 2.6.13, in order to avoid problems first reported
by John Hawkes (corrupt sched data structures and kernel oops).

This patch removes the partial disabling code in 2.6.13-rc7,
in anticipation of the next patch, which will totally disable
it instead.

Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years agoMerge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
Linus Torvalds [Fri, 26 Aug 2005 23:32:31 +0000]
Merge HEAD from /linux/kernel/git/davem/net-2.6.git

14 years ago[PATCH] hwmon: Off-by-one error in fscpos driver
Jean Delvare [Thu, 25 Aug 2005 16:43:37 +0000]
[PATCH] hwmon: Off-by-one error in fscpos driver

Coverity uncovered an off-by-one error in the fscpos driver, in function
set_temp_reset(). Writing to the temp3_reset sysfs file will lead to an
array overrun, in turn causing an I2C write to a random register of the
FSC Poseidon chip. Additionally, writing to temp1_reset and temp2_reset
will not work as expected. The fix is straightforward.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] ppc32 8xx: fix m8xx_ide_init() #ifdef
Marcelo Tosatti [Tue, 23 Aug 2005 20:20:44 +0000]
[PATCH] ppc32 8xx: fix m8xx_ide_init() #ifdef

Be more precise on deciding whether to call m8xx_ide_init() at
m8xx_setup.c:platform_init().

Compilation fails if CONFIG_BLK_DEV_IDE is defined but
CONFIG_BLK_DEV_MPC8xx_IDE isnt.

Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] late spinlock initialization in ieee1394/ohci
Al Viro [Thu, 25 Aug 2005 22:13:14 +0000]
[PATCH] late spinlock initialization in ieee1394/ohci

spinlock used in irq handler should be initialized before registering
irq, even if we know that our device has interrupts disabled; handler
is registered shared and taking spinlock is done unconditionally.  As
it is, we can and do get oopsen on boot for some configuration, depending
on irq routing - I've got a reproducer.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Ben Collins <bcollins@debian.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] bogus function type in qdio
Al Viro [Thu, 25 Aug 2005 22:03:35 +0000]
[PATCH] bogus function type in qdio

In qdio_get_micros() volatile in return type is plain noise (even with old
gccisms it would make no sense - noreturn function returning __u64 is a
bit odd ;-)

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] bogus iounmap() in emac
Al Viro [Thu, 25 Aug 2005 21:59:48 +0000]
[PATCH] bogus iounmap() in emac

Dumb typo: iounmap(&local_pointer_variable).

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] drivers/hwmon/*: kfree() correct pointers
Alexey Dobriyan [Thu, 25 Aug 2005 21:49:14 +0000]
[PATCH] drivers/hwmon/*: kfree() correct pointers

The adm9240 driver, in adm9240_detect(), allocates a structure.  The
error path attempts to kfree() ->client field of it (second one),
resulting in an oops (or slab corruption) if the hardware is not present.

->client field in adm1026, adm1031, smsc47b397 and smsc47m1 is the first in
${HWMON}_data structure, but fix them too.

Signed-off-by: Jonathan Corbet <corbet@lwn.net
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Fix oops in fs/locks.c on close of file with pending locks
Steve French [Fri, 26 Aug 2005 19:42:59 +0000]
[PATCH] Fix oops in fs/locks.c on close of file with pending locks

The recent change to locks_remove_flock code in fs/locks.c changes how
byte range locks are removed from closing files, which shows up a bug in
cifs.

The assumption in the cifs code was that the close call sent to the
server would remove any pending locks on the server on this file, but
that is no longer safe as the fs/locks.c code on the client wants unlock
of 0 to PATH_MAX to remove all locks (at least from this client, it is
not possible AFAIK to remove all locks from other clients made to the
server copy of the file).

Note that cifs locks are different from posix locks - and it is not
possible to map posix locks perfectly on the wire yet, due to
restrictions of the cifs network protocol, even to Samba without adding
a new request type to the network protocol (which we plan to do for
Samba 3.0.21 within a few months), but the local client will have the
correct, posix view, of the lock in most cases.

The correct fix for cifs for this would involve a bigger change than I
would like to do this late in the 2.6.13-rc cycle - and would involve
cifs keeping track of all unmerged (uncoalesced) byte range locks for
each remote inode and scanning that list to remove locks that intersect
or fall wholly within the range - locks that intersect may have to be
reaquired with the smaller, remaining range.

Signed-off-by: Steve French <sfrench@us.ibm.com>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] hppfs: fix symlink error path
Paolo 'Blaisorblade' Giarrusso [Fri, 26 Aug 2005 14:57:53 +0000]
[PATCH] hppfs: fix symlink error path

While touching this code I noticed the error handling is bogus, so I
fixed it up.

I've removed the IS_ERR(proc_dentry) check, which will never trigger and
is clearly a typo: we must check proc_file instead.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Fixup symlink function pointers for hppfs [for 2.6.13]
Paolo 'Blaisorblade' Giarrusso [Fri, 26 Aug 2005 14:57:44 +0000]
[PATCH] Fixup symlink function pointers for hppfs [for 2.6.13]

Update hppfs for the symlink functions prototype change.

Yes, I know the code I leave there is still _bogus_, see next patch for
this.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Document idr_get_new_above() semantics, update inotify
John McCutchan [Fri, 26 Aug 2005 18:02:04 +0000]
[PATCH] Document idr_get_new_above() semantics, update inotify

There is an off by one problem with idr_get_new_above.

The comment and function name suggest that it will return an id >
starting_id, but it actually returned an id >= starting_id, and kernel
callers other than inotify treated it as such.

The patch below fixes the comment, and fixes inotifys usage.  The
function name still doesn't match the behaviour, but it never did.

Signed-off-by: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years agoIgnore disabled ROM resources at setup
Linus Torvalds [Fri, 26 Aug 2005 17:49:22 +0000]
Ignore disabled ROM resources at setup

Writing even a disabled value seems to mess up some matrox graphics
cards.  It may be a card-related issue, but we may also be writing
reserved low bits in the result.

This was a fall-out of switching x86 over to the generic PCI resource
allocation code, and needs more debugging.  In particular, the old x86
code defaulted to not doing any resource allocations at all for ROM
resources.

In the meantime, this has been reported to make X happier by Helge
Hafting <helgehaf@aitel.hist.no>.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years agoOnly pre-allocate 256 bytes of cardbio IO range
Linus Torvalds [Fri, 26 Aug 2005 17:40:10 +0000]
Only pre-allocate 256 bytes of cardbio IO range

It may seem small, but most cards need much less, if any, and this not
only makes the code adhere to the comment, it seems to fix a boot-time
lockup on a ThinkPad 380XD laptop reported by Tero Roponen <teanropo@cc.jyu.fi>

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[TG3]: Fix ethtool loopback test lockup
Michael Chan [Thu, 25 Aug 2005 22:31:41 +0000]
[TG3]: Fix ethtool loopback test lockup

The tg3_abort_hw() call in tg3_test_loopback() is causing lockups on
some devices. tg3_abort_hw() disables the memory arbiter, causing
tg3_reset_hw() to hang when it tries to write the pre-reset signature.
tg3_abort_hw() should only be called after the pre-reset signature has
been written. This is all done in tg3_reset_hw() so the tg3_abort_hw()
call is unnecessary and can be removed.

[ Also bump driver version and release date. -DaveM ]

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

14 years ago[PATCH] cfq-iosched.c: minor fixes
Jens Axboe [Wed, 24 Aug 2005 12:57:54 +0000]
[PATCH] cfq-iosched.c: minor fixes

One critical fix and two minor fixes for 2.6.13-rc7:

- Max depth must currently be 2 to allow barriers to function on SCSI
- Prefer sync request over async in choosing the next request
- Never allow async request to preempt or disturb the "anticipation" for
  a single cfq process context. This is as-designed, the code right now
  is buggy in that area.

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Export pcibios_bus_to_resource
Keith Owens [Wed, 24 Aug 2005 06:06:25 +0000]
[PATCH] Export pcibios_bus_to_resource

pcibios_bus_to_resource is exported on all architectures except ia64
and sparc.  Add exports for the two missing architectures.  Needed when
Yenta socket support is compiled as a module.

Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] x86_64: update defconfig - reenable fusion
Andi Kleen [Wed, 24 Aug 2005 05:37:37 +0000]
[PATCH] x86_64: update defconfig - reenable fusion

I mistakedly disabled fusion support in an earlier update. Fusion
is commonly used on many x86-64 systems, so this was a problem.
This patch fixes that.

Signed-off-by: And Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] ppc64: Export machine_power_off for therm_pm72 module
Benjamin Herrenschmidt [Wed, 24 Aug 2005 04:18:53 +0000]
[PATCH] ppc64: Export machine_power_off for therm_pm72 module

This patch puts back the export of machine_power_off() that was removed
by some janitor as it's used for emergency shutdown by the G5 thermal
control driver. Wether that driver should use kernel_power_off() instead
is debatable and a post-2.6.13 decision. In the meantime, please commit
that patch that fixes the driver for now.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] cpu_exclusive sched domains build fix
Paul Jackson [Wed, 24 Aug 2005 11:15:10 +0000]
[PATCH] cpu_exclusive sched domains build fix

As reported by Paul Mackerras <paulus@samba.org>, the previous patch
"cpu_exclusive sched domains fix" broke the ppc64 build with
CONFIC_CPUSET, yielding error messages:

kernel/cpuset.c: In function 'update_cpu_domains':
kernel/cpuset.c:648: error: invalid lvalue in unary '&'
kernel/cpuset.c:648: error: invalid lvalue in unary '&'

On some arch's, the node_to_cpumask() is a function, returning
a cpumask_t.  But the for_each_cpu_mask() requires an lvalue mask.

The following patch fixes this build failure by making a copy
of the cpumask_t on the stack.

Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] m68k: fix broken macros causing compile errors
Andreas Schwab [Wed, 24 Aug 2005 15:36:21 +0000]
[PATCH] m68k: fix broken macros causing compile errors

Add parens around macro parameters.

Signed-off-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[FIB_TRIE]: Don't ignore negative results from fib_semantic_match
Patrick McHardy [Wed, 24 Aug 2005 05:06:09 +0000]
[FIB_TRIE]: Don't ignore negative results from fib_semantic_match

When a semantic match occurs either success, not found or an error
(for matching unreachable routes/blackholes) is returned. fib_trie
ignores the errors and looks for a different matching route. Treat
results other than "no match" as success and end lookup.

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

14 years agoLinux v2.6.13-rc7
Linus Torvalds [Wed, 24 Aug 2005 03:39:14 +0000]
Linux v2.6.13-rc7

Too many changes to release a final 2.6.13.

14 years ago[PATCH] Fix IXP4xx CLOCK_TICK_RATE
Deepak Saxena [Tue, 23 Aug 2005 20:30:29 +0000]
[PATCH] Fix IXP4xx CLOCK_TICK_RATE

As pointed out in the following thread, the CLOCK_TICK_RATE setting for
IXP4xx is incorrect b/c the HW ignores the lowest 2 bits of the LATCH
value.

   http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel/2005-August/030950.html

Tnx to George Anziger and Egil Hjelmeland for finding the issue.

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] cpu_exclusive sched domains on partial nodes temp fix
Paul Jackson [Tue, 23 Aug 2005 08:04:27 +0000]
[PATCH] cpu_exclusive sched domains on partial nodes temp fix

This keeps the kernel/cpuset.c routine update_cpu_domains() from
invoking the sched.c routine partition_sched_domains() if the cpuset in
question doesn't fall on node boundaries.

I have boot tested this on an SN2, and with the help of a couple of ad
hoc printk's, determined that it does indeed avoid calling the
partition_sched_domains() routine on partial nodes.

I did not directly verify that this avoids setting up bogus sched
domains or avoids the oops that Hawkes saw.

This patch imposes a silent artificial constraint on which cpusets can
be used to define dynamic sched domains.

This patch should allow proceeding with this new feature in 2.6.13 for
the configurations in which it is useful (node alligned sched domains)
while avoiding trying to setup sched domains in the less useful cases
that can cause the kernel corruption and oops.

Signed-off-by: Paul Jackson <pj@sgi.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Dinakar Guniguntala <dino@in.ibm.com>
Acked-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years agoMerge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Wed, 24 Aug 2005 03:00:48 +0000]
Merge head 'upstream-fixes' of /linux/kernel/git/jgarzik/misc-2.6

14 years agoMerge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Wed, 24 Aug 2005 03:00:17 +0000]
Merge head 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev

14 years ago[PATCH] x86_64: Don't oops at boot when empty Opteron node has IO
Andi Kleen [Tue, 23 Aug 2005 01:14:27 +0000]
[PATCH] x86_64: Don't oops at boot when empty Opteron node has IO

The code to detect IO links on Opteron would not check
if the node had actually memory. This could lead to pci_bus_to_node
returning an invalid node, which might cause crashes later
when dma_alloc_coherent passes it to page_alloc_node().

The bug has been there forever but for some reason
it is causing now crashes.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] usbnet oops fix
lepton [Tue, 23 Aug 2005 00:06:14 +0000]
[PATCH] usbnet oops fix

There's a "return the wrong SKB" error in the GL620A cable minidriver
(for "usbnet") which can oops.  This would not appear when talking
Linux-to-Linux, only Linux-to-Windows (for recent Linuxes).

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] i386: fix incorrect FP signal code
Chuck Ebbert [Wed, 24 Aug 2005 01:36:40 +0000]
[PATCH] i386: fix incorrect FP signal code

i386 floating-point exception handling has a bug that can cause error
code 0 to be sent instead of the proper code during signal delivery.

This is caused by unconditionally checking the IS and c1 bits from the
FPU status word when they are not always relevant.  The IS bit tells
whether an exception is a stack fault and is only relevant when the
exception is IE (invalid operation.) The C1 bit determines whether a
stack fault is overflow or underflow and is only relevant when IS and IE
are set.

Signed-off-by: Chuck Ebbert <76306.1226@compuserve.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Wed, 24 Aug 2005 02:21:44 +0000]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

14 years ago[PATCH] s390 __CHECKER__ ifdefs
Al Viro [Tue, 23 Aug 2005 21:48:22 +0000]
[PATCH] s390 __CHECKER__ ifdefs

remove the bogus games with explicit ifdefs on __CHECKER__

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] %t... in vsnprintf
Al Viro [Tue, 23 Aug 2005 21:48:17 +0000]
[PATCH] %t... in vsnprintf

handling of %t... (ptrdiff_t) in vsnprintf

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] ad1980 makefile fix
Al Viro [Tue, 23 Aug 2005 21:48:12 +0000]
[PATCH] ad1980 makefile fix

ac97_plugin_ad1980 should trigger build of ac97_codec

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (non-modular SCSI drivers)
Al Viro [Tue, 23 Aug 2005 21:48:07 +0000]
[PATCH] Kconfig fix (non-modular SCSI drivers)

non-modular scsi drivers depend on built-in scsi

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (missing dependencies on PCI in sound/*)
Al Viro [Tue, 23 Aug 2005 21:48:02 +0000]
[PATCH] Kconfig fix (missing dependencies on PCI in sound/*)

a bunch of PCI-only drivers didn't have the right dependency

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] missing exports on m32r
Al Viro [Tue, 23 Aug 2005 21:47:57 +0000]
[PATCH] missing exports on m32r

missing exports on m32r

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] qualifiers in return types - easy cases
Al Viro [Tue, 23 Aug 2005 21:47:52 +0000]
[PATCH] qualifiers in return types - easy cases

a bunch of functions switched from volatile to __attribute__((noreturn)) and
from const to __attribute_pure__

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] typo fix in qdio.c
Al Viro [Tue, 23 Aug 2005 21:47:47 +0000]
[PATCH] typo fix in qdio.c

dumb typo: u32 volatile * mistyped as u32 * volatile

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] emac netpoll fix
Al Viro [Tue, 23 Aug 2005 21:47:42 +0000]
[PATCH] emac netpoll fix

netpoll is void(struct net_device *), not int(struct net_device *)

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] vidc gcc4 fix
Al Viro [Tue, 23 Aug 2005 21:47:37 +0000]
[PATCH] vidc gcc4 fix

removes an extern for a static variable.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] broken inline asm on s390 (misuse of labels)
Al Viro [Tue, 23 Aug 2005 21:47:32 +0000]
[PATCH] broken inline asm on s390 (misuse of labels)

use of explicit labels in inline asm is a Bad Idea(tm), since gcc can
decide to inline the function in several places.  Fixed by use of 1f/f:
instead of .Lfitsin/.Lfitsin:

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] m32r_sio gcc4 fixes
Al Viro [Tue, 23 Aug 2005 21:47:27 +0000]
[PATCH] m32r_sio gcc4 fixes

extern declaration followed by static in drivers/serial/m32r_sio.c

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] m32r icu_data gcc4 fixes
Al Viro [Tue, 23 Aug 2005 21:47:22 +0000]
[PATCH] m32r icu_data gcc4 fixes

either icu_data declaration for SMP case should be taken out of m32102.h,
or its declarations for m32700ut and opsput should not be static for SMP.
Patch does the latter - judging by comments in m32102.h it is intended to
be non-static.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] m32r smp.h gcc4 fixes
Al Viro [Tue, 23 Aug 2005 21:47:17 +0000]
[PATCH] m32r smp.h gcc4 fixes

extern on physid_2_cpu[] does not belong in smp.h - the thing is static.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] alpha spinlock code and bogus constraints
Al Viro [Tue, 23 Aug 2005 21:47:12 +0000]
[PATCH] alpha spinlock code and bogus constraints

"=m" (lock->lock) / "1" (lock->lock) makes gcc4 unhappy; fixed by s/1/m/,
same as in case of i386 rwsem.h where such variant had been accepted
by both Linus and rth.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] alpha xchg fix
Al Viro [Tue, 23 Aug 2005 21:47:07 +0000]
[PATCH] alpha xchg fix

alpha xchg has to be a macro - alpha disables always_inline and if that
puppy does not get inlined, we immediately blow up on undefined reference.
Happens even on gcc3; with gcc4 that happens a _lot_.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] missing include in pcmcia_resource.c
Al Viro [Tue, 23 Aug 2005 21:47:01 +0000]
[PATCH] missing include in pcmcia_resource.c

missing include of asm/irq.h

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] alpha gcc4 warnings
Al Viro [Tue, 23 Aug 2005 21:46:56 +0000]
[PATCH] alpha gcc4 warnings

on UP smp_call_function() is expanded to expression.  Alpha oprofile
calls that puppy and ignores the return value.  And has -Werror for
arch/*...

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (sparc32 drivers/char dependencies)
Al Viro [Tue, 23 Aug 2005 21:46:51 +0000]
[PATCH] Kconfig fix (sparc32 drivers/char dependencies)

since sparc32 Kconfig includes drivers/char/Kconfig (instead of duplicating
its parts) we need several new dependencies there to exclude the stuff
broken on sparc32 and not excluded by existing dependencies.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (emac dependencient)
Al Viro [Tue, 23 Aug 2005 21:46:46 +0000]
[PATCH] Kconfig fix (emac dependencient)

emac doesn't build modular; ibm_emac_debug doesn't build at all (missing
headers).

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (CONFIG_PM on 44x)
Al Viro [Tue, 23 Aug 2005 21:46:41 +0000]
[PATCH] Kconfig fix (CONFIG_PM on 44x)

CONFIG_PM is broken on 44x; removed duplicate entry for CONFIG_PM, made
the inclusion of generic one conditional on BROKEN || !44x.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (ppc 4xx and early serial)
Al Viro [Tue, 23 Aug 2005 21:46:36 +0000]
[PATCH] Kconfig fix (ppc 4xx and early serial)

a bunch of ppc 4xx variants unconditionally calls early_serial_setup() and
therefore needs SERIAL_8250

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (IRQ_ALL_CPUS vs. MV64360)
Al Viro [Tue, 23 Aug 2005 21:46:31 +0000]
[PATCH] Kconfig fix (IRQ_ALL_CPUS vs. MV64360)

MV64360 does not support IRQ_ALL_CPUS - see arch/ppc/kernel/mv64360_pic.c.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (ppc32 SMP dependencies)
Al Viro [Tue, 23 Aug 2005 21:46:26 +0000]
[PATCH] Kconfig fix (ppc32 SMP dependencies)

ppc SMP is supported only for 6xx/POWER3/POWER4 - i.e. ones that have
PPC_STD_MMU.  Dependency fixed.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Acked-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (VGA console on arm/versatile)
Al Viro [Tue, 23 Aug 2005 21:46:21 +0000]
[PATCH] Kconfig fix (VGA console on arm/versatile)

VGA console doesn't exist (or build) on arm/versatile; dependency fixed.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (amba on arm/versatile)
Al Viro [Tue, 23 Aug 2005 21:46:16 +0000]
[PATCH] Kconfig fix (amba on arm/versatile)

AMBA_PL010 is broken on arm/versatile; marked as such

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (acornscsi)
Al Viro [Tue, 23 Aug 2005 21:46:11 +0000]
[PATCH] Kconfig fix (acornscsi)

acornscsi had been broken for a long time; marked as such

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (M32R_PLDSIO dependecies)
Al Viro [Tue, 23 Aug 2005 21:46:06 +0000]
[PATCH] Kconfig fix (M32R_PLDSIO dependecies)

M32R_PLDSIO depends on subarchitecture providing PLD_ESIO0CR and
friends.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (parport_pc on m32r)
Al Viro [Tue, 23 Aug 2005 21:46:01 +0000]
[PATCH] Kconfig fix (parport_pc on m32r)

parport_pc shouldn't be picked on m32r (no asm/parport.h, for starters)

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (airo_cs on m32r)
Al Viro [Tue, 23 Aug 2005 21:45:56 +0000]
[PATCH] Kconfig fix (airo_cs on m32r)

airo_cs is broken on m32r; marked as such. [Proper fix would involve
separating PCI-dependent parts and making sure they don't get in the
way _and_ arranging for asm/scatterlist.h getting picked on m32r]

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (tms380tr and ISA_DMA_API)
Al Viro [Tue, 23 Aug 2005 21:45:51 +0000]
[PATCH] Kconfig fix (tms380tr and ISA_DMA_API)

ISA parts of tms380tr are using ISA DMA helpers and should depend on
ISA_DMA_API.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (arv)
Al Viro [Tue, 23 Aug 2005 21:45:46 +0000]
[PATCH] Kconfig fix (arv)

arv uses constants provided only by include/asm-m32r/m32700ut/m32700ut_lan.h
It won't build for any subarchitecture other than M32700UT; marked as such.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (infiniband and PCI)
Al Viro [Tue, 23 Aug 2005 21:45:41 +0000]
[PATCH] Kconfig fix (infiniband and PCI)

infiniband uses PCI helpers all over the place (including the core parts) and
won't build without PCI.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (DEBUG_PAGEALLOC on m32r)
Al Viro [Tue, 23 Aug 2005 21:45:36 +0000]
[PATCH] Kconfig fix (DEBUG_PAGEALLOC on m32r)

DEBUG_PAGEALLOC is broken on m32r - the option had been blindly copied from
i386; kernel_map_pages() had not and that's what is needed for DEBUG_PAGEALLOC
to work (or link, while we are at it).

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (PCI on m32r)
Al Viro [Tue, 23 Aug 2005 21:45:31 +0000]
[PATCH] Kconfig fix (PCI on m32r)

PCI support is broken on m32r (pci_map_... missing, etc.); marked as such

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (PMAC_BACKLIGHT on ppc64)
Al Viro [Tue, 23 Aug 2005 21:45:26 +0000]
[PATCH] Kconfig fix (PMAC_BACKLIGHT on ppc64)

PMAC_BACKLIGHT is broken on ppc64; marked as such

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (HISAX_FRITZPCI on ppc64)
Al Viro [Tue, 23 Aug 2005 21:45:21 +0000]
[PATCH] Kconfig fix (HISAX_FRITZPCI on ppc64)

HISAX_FRITZPCI is broken on ppc64; marked as such

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (m32r genrtc)
Al Viro [Tue, 23 Aug 2005 21:45:16 +0000]
[PATCH] Kconfig fix (m32r genrtc)

genrtc is not for m32r; marked as such.  Probably ought to put that into
arch/* - list of "don't build it on <platform>" is getting too long.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (m32r NUMA)
Al Viro [Tue, 23 Aug 2005 21:45:11 +0000]
[PATCH] Kconfig fix (m32r NUMA)

NUMA is broken on m32r; marked as such

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (ISA_DMA_API and sound/*)
Al Viro [Tue, 23 Aug 2005 21:45:06 +0000]
[PATCH] Kconfig fix (ISA_DMA_API and sound/*)

fixed kconfig dependencies on ISA_DMA_API for parts of sound/* that rely
on it.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (epca on 64bit)
Al Viro [Tue, 23 Aug 2005 21:45:01 +0000]
[PATCH] Kconfig fix (epca on 64bit)

epca is broken on 64bit; marked as such

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (arm SMP)
Al Viro [Tue, 23 Aug 2005 21:44:55 +0000]
[PATCH] Kconfig fix (arm SMP)

SMP is broken on arm; marked as such

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] Kconfig fix (alpha NUMA)
Al Viro [Tue, 23 Aug 2005 21:44:50 +0000]
[PATCH] Kconfig fix (alpha NUMA)

NUMA is broken on alpha; marked as such

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[ROSE]: Fix typo in rose_route_frame() locking fix.
David S. Miller [Tue, 23 Aug 2005 21:55:32 +0000]
[ROSE]: Fix typo in rose_route_frame() locking fix.

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

14 years ago[PATCH] zd1201 kmalloc size fix
Alexey Dobriyan [Mon, 22 Aug 2005 20:11:09 +0000]
[PATCH] zd1201 kmalloc size fix

Noticed by Coverity checker.

(akpm: I stole this from Greg's tree and used the (IMO) tidier sizeof(*p)
construct).

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] md: make sure resync gets started when array starts.
NeilBrown [Mon, 22 Aug 2005 20:11:08 +0000]
[PATCH] md: make sure resync gets started when array starts.

We weren't actually waking up the md thread after setting
MD_RECOVERY_NEEDED when assembling an array, so it is possible to lose a
race and not actually start resync.

So add a call to md_wakeup_thread, and while we are at it, remove all the
"if (mddev->thread)" guards as md_wake_thread does its own checking.

Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years ago[PATCH] preempt race in getppid
David Meybohm [Mon, 22 Aug 2005 20:11:08 +0000]
[PATCH] preempt race in getppid

With CONFIG_PREEMPT && !CONFIG_SMP, it's possible for sys_getppid to
return a bogus value if the parent's task_struct gets reallocated after
current->group_leader->real_parent is read:

        asmlinkage long sys_getppid(void)
        {
                int pid;
                struct task_struct *me = current;
                struct task_struct *parent;

                parent = me->group_leader->real_parent;
RACE HERE =>    for (;;) {
                        pid = parent->tgid;
        #ifdef CONFIG_SMP
        {
                        struct task_struct *old = parent;

                        /*
                         * Make sure we read the pid before re-reading the
                         * parent pointer:
                         */
                        smp_rmb();
                        parent = me->group_leader->real_parent;
                        if (old != parent)
                                continue;
        }
        #endif
                        break;
                }
                return pid;
        }

If the process gets preempted at the indicated point, the parent process
can go ahead and call exit() and then get wait()'d on to reap its
task_struct. When the preempted process gets resumed, it will not do any
further checks of the parent pointer on !CONFIG_SMP: it will read the
bad pid and return.

So, the same algorithm used when SMP is enabled should be used when
preempt is enabled, which will recheck ->real_parent in this case.

Signed-off-by: David Meybohm <dmeybohmlkml@bellsouth.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

14 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Tue, 23 Aug 2005 18:06:56 +0000]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

14 years ago[ROSE]: Fix missing unlocks in rose_route_frame()
David S. Miller [Tue, 23 Aug 2005 17:50:09 +0000]
[ROSE]: Fix missing unlocks in rose_route_frame()

Noticed by Coverity checker.

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

14 years ago[TCP]: Document non-trivial locking path in tcp_v{4,6}_get_port().
David S. Miller [Tue, 23 Aug 2005 17:49:54 +0000]
[TCP]: Document non-trivial locking path in tcp_v{4,6}_get_port().

This trips up a lot of folks reading this code.
Put an unlikely() around the port-exhaustion test
for good measure.

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

14 years ago[TCP]: Unconditionally clear TCP_NAGLE_PUSH in skb_entail().
David S. Miller [Tue, 23 Aug 2005 17:13:06 +0000]
[TCP]: Unconditionally clear TCP_NAGLE_PUSH in skb_entail().

Intention of this bit is to force pushing of the existing
send queue when TCP_CORK or TCP_NODELAY state changes via
setsockopt().

But it's easy to create a situation where the bit never
clears.  For example, if the send queue starts empty:

1) set TCP_NODELAY
2) clear TCP_NODELAY
3) set TCP_CORK
4) do small write()

The current code will leave TCP_NAGLE_PUSH set after that
sequence.  Unconditionally clearing the bit when new data
is added via skb_entail() solves the problem.

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

14 years ago[PKT_SCHED]: Fix missing qdisc_destroy() in qdisc_create_dflt()
Thomas Graf [Tue, 23 Aug 2005 17:12:44 +0000]
[PKT_SCHED]: Fix missing qdisc_destroy() in qdisc_create_dflt()

qdisc_create_dflt() is missing to destroy the newly allocated
default qdisc if the initialization fails resulting in leaks
of all kinds. The only caller in mainline which may trigger
this bug is sch_tbf.c in tbf_create_dflt_qdisc().

Note: qdisc_create_dflt() doesn't fulfill the official locking
      requirements of qdisc_destroy() but since the qdisc could
      never be seen by the outside world this doesn't matter
      and it can stay as-is until the locking of pkt_sched
      is cleaned up.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

14 years ago[SCTP]: Add SENTINEL to SCTP MIB stats
Vlad Yasevich [Tue, 23 Aug 2005 17:12:04 +0000]
[SCTP]: Add SENTINEL to SCTP MIB stats

Add SNMP_MIB_SENTINEL to the definition of the sctp_snmp_list so that
the output routine in proc correctly terminates.  This was causing some
problems running on ia64 systems.

Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

14 years ago[AX25]: UID fixes
Ralf Baechle [Tue, 23 Aug 2005 17:11:45 +0000]
[AX25]: UID fixes

 o Brown paperbag bug - ax25_findbyuid() was always returning a NULL pointer
   as the result.  Breaks ROSE completly and AX.25 if UID policy set to deny.

 o While the list structure of AX.25's UID to callsign mapping table was
   properly protected by a spinlock, it's elements were not refcounted
   resulting in a race between removal and usage of an element.

Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

14 years ago[NET]: Fix socket bitop damage
Ralf Baechle [Tue, 23 Aug 2005 17:11:30 +0000]
[NET]: Fix socket bitop damage

The socket flag cleanups that went into 2.6.12-rc1 are basically oring
the flags of an old socket into the socket just being created.
Unfortunately that one was just initialized by sock_init_data(), so already
has SOCK_ZAPPED set.  As the result zapped sockets are created and all
incoming connection will fail due to this bug which again was carefully
replicated to at least AX.25, NET/ROM or ROSE.

In order to keep the abstraction alive I've introduced sock_copy_flags()
to copy the socket flags from one sockets to another and used that
instead of the bitwise copy thing.  Anyway, the idea here has probably
been to copy all flags, so sock_copy_flags() should be the right thing.
With this the ham radio protocols are usable again, so I hope this will
make it into 2.6.13.

Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

14 years ago[NETFILTER]: Fix HW checksum handling in ip_queue/ip6_queue
Patrick McHardy [Tue, 23 Aug 2005 17:10:35 +0000]
[NETFILTER]: Fix HW checksum handling in ip_queue/ip6_queue

The checksum needs to be filled in on output, after mangling a packet
ip_summed needs to be reset.

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