]> git.neil.brown.name Git - history.git/log
history.git
21 years ago[PATCH] sysfs: fix sysfs_dir_close memory leak
Greg Kroah-Hartman [Fri, 3 Dec 2004 04:40:55 +0000 (20:40 -0800)]
[PATCH] sysfs: fix sysfs_dir_close memory leak

sysfs_dir_close did not free the "cursor" sysfs_dirent used for keeping
track of position in the list of sysfs_dirent nodes.  Consequently,
doing a "find /sys" would leak a sysfs_dirent for each of the 1140
directories in my /sys tree, or about 36kB each time.

From: "Adam J. Richter" <adam@yggdrasil.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] Driver Core: restore comment in kobject_uevent.c
Greg Kroah-Hartman [Fri, 3 Dec 2004 04:40:41 +0000 (20:40 -0800)]
[PATCH] Driver Core: restore comment in kobject_uevent.c

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] proc_pid_status() oops fix
Manfred Spraul [Thu, 2 Dec 2004 23:47:45 +0000 (15:47 -0800)]
[PATCH] proc_pid_status() oops fix

proc_pid_status dereferences pointers in the task structure even if the
task is already dead.  This is probably the reason for the oops described
in

http://bugme.osdl.org/show_bug.cgi?id=3812

The attached patch removes the pointer dereferences by using pid_alive()
for testing that the task structure contents is still valid before
dereferencing them.  The task structure itself is guaranteed to be valid -
we hold a reference count.

Signed-Off-By: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] VISWS: prevent APM
Randy Dunlap [Thu, 2 Dec 2004 23:47:32 +0000 (15:47 -0800)]
[PATCH] VISWS: prevent APM

Prevent X86_VISWS config from building APM support.  APM isn't supported
and it won't build if attempted.  Also disable P4THERMAL for VISWS.

Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Acked-by: Andrey Panin <pazke@donpac.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] fix uninitialized variable in waitid(2)
Joe Korty [Thu, 2 Dec 2004 23:47:19 +0000 (15:47 -0800)]
[PATCH] fix uninitialized variable in waitid(2)

Specify an initial value signal_struct's field stop_state whenever a
signal_struct variable is created.

Bug was discovered through the occasional failure of telnet(1) to connect.

Signed-off-by: Joe Korty <joe.korty@ccur.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] fbdev: fix wrong colors at 16 bpp in tridentfb
Antonino Daplas [Thu, 2 Dec 2004 23:47:08 +0000 (15:47 -0800)]
[PATCH] fbdev: fix wrong colors at 16 bpp in tridentfb

Timothy Lee reports:

Hardware: CyberBlade/i1 on VIA Epia-800

Problem Description:  When the framebuffer is set to 16 bpp, console's text
colours are incorrect.  For example, white becomes yellow, black becomes blue, etc.

Steps to reproduce:
1. Load tridentfb
2. Use "setterm -n -depth 16" to request 16 bpp framebuffer

The problem arose from the fact that each psuedo palette entry should be
32-bit in size, even under 16-bit display mode.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] Fix warnings in ibm_emac driver
Matt Porter [Thu, 2 Dec 2004 23:46:55 +0000 (15:46 -0800)]
[PATCH] Fix warnings in ibm_emac driver

This patch fixes annoying warnings in ibm_emac driver.

Signed-off-by: Eugene Surovegin <ebs@ebshome.net>
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] sys_set/getpriority PRIO_USER semantics fix and optimisation
Prasanna Meda [Thu, 2 Dec 2004 23:46:44 +0000 (15:46 -0800)]
[PATCH] sys_set/getpriority PRIO_USER semantics fix and optimisation

This change brings the semantics equivalent to 2.4 and also to what the man
page says; Also optimises by avoiding unneeded lookup in uid cache, when
who is same as the current->uid.

sys_set/getpriority is rewritten in 2.5/2.6, perhaps while transitioning to
the pid maps.  It has now semantical bug, when uid is zero.  Note that akpm
also fixed refcount leak and locking in the new functions in changeset
http://linus.bkbits.net:8080/linux-2.5/cset@1.1608.10.84

Signed-off-by: <pmeda@akamai.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] Avoid deadlock in smc91x driver
Ian Campbell [Thu, 2 Dec 2004 23:46:29 +0000 (15:46 -0800)]
[PATCH] Avoid deadlock in smc91x driver

This patch avoids a deadlock on rtnl_sem in smc_close() when bringing down
an smc91x interface.  The semaphore is already held by devinet_ioctl() and
the pending work queue contains linkwatch_event() (scheduled by
netif_carrier_off()) which also wants rtnl_sem hence it is unsafe to call
flush_scheduled_work().

The solution is to track whether we have any pending work of our own and
wait for that instead of flushing the entire queue.

I also fixed a typo 'ence' -> 'Hence' and renamed smc_detect_phy to
smc_phy_detect in order to follow the same pattern as the other smc_phy_*
functions.

Signed-off-by: Ian Campbell <icampbell@arcom.com>
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] M68k HP Lance Ethernet depends on DIO bus support
Geert Uytterhoeven [Thu, 2 Dec 2004 23:46:19 +0000 (15:46 -0800)]
[PATCH] M68k HP Lance Ethernet depends on DIO bus support

HP Lance Ethernet depends on DIO bus support

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] M68k Ethernet drivers depend on NET_ETHERNET
Geert Uytterhoeven [Thu, 2 Dec 2004 23:46:06 +0000 (15:46 -0800)]
[PATCH] M68k Ethernet drivers depend on NET_ETHERNET

M68k Ethernet drivers depend on NET_ETHERNET instead of NETDEVICES

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] acpi_processor_idle() latency fix
Ingo Molnar [Thu, 2 Dec 2004 23:45:53 +0000 (15:45 -0800)]
[PATCH] acpi_processor_idle() latency fix

We check need_resched() _before_ disabling preemption.  This opens up the
following scenario:

 swapper: !need_resched()
 [IRQ context]
wakes up a task
marks idle task as need-resched

 swapper: acpi_processor_idle(); // sleeps until next irq

instant 1msec latency introduced...

normally default_idle() is safe because it re-checks need_resched with
interrupts disabled before it truly halts the CPU.  But
acpi_processor_idle() doesnt seem to be doing this!  Your trace clearly
shows a missed preemption due to ACPI.  I'm wondering why no-one has
triggered this before, it's a really bad bug that should be fixed in
2.6.10.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] Allow multiple cpus in irq affinity call
Anton Blanchard [Thu, 2 Dec 2004 23:45:40 +0000 (15:45 -0800)]
[PATCH] Allow multiple cpus in irq affinity call

The generic irq affinity code limits us to a single cpu target regardless
of what the architecture supports.  If required this should be done in the
architecture specific ->set_affinity call.

With this patch ppc64 is able to select all cpus affinity again.

Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] s390: qeth network driver
Martin Schwidefsky [Thu, 2 Dec 2004 23:45:27 +0000 (15:45 -0800)]
[PATCH] s390: qeth network driver

From: Thomas Spatzier <tspat@de.ibm.com>

network driver changes:
 - qeth: Handle both VLAN_FRAME and INCLUDES_VLAN_TAG in qdio header.
 - qeth: Always save IP addresses registered on a card when going offline.
 - qeth: Check size of printk buffer to 4K for ipa_takeover, vipa & rxip.

From: Thomas Spatzier <tspat@de.ibm.com>,
      Heiko Carstens <heiko.carstens@de.ibm.com>

Thomas created the patch below which removes the hardcoded 3900 bytes
limit as suggested by Jeff Garzik. Please apply.

network driver changes:
 - qeth: Calculate end of sysfs data buffer correctly.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] s390: network driver
Martin Schwidefsky [Thu, 2 Dec 2004 23:45:14 +0000 (15:45 -0800)]
[PATCH] s390: network driver

From: Thomas Spatzier <tspat@de.ibm.com>
From: Peter Tiedemann <ptiedem@de.ibm.com>

network driver changes:
 - qeth: return -EINVAL if an skb is too large.
 - qeth: don't call netif_stop_queue after cable pull. Drop the
   packets instead.
 - qeth: fix race between SET_IP and SET_MC kernel thread by removing
   SET_MC thread and let the SET_IP thread do multicast requests as well.
 - qeth: make it compile without CONFIG_VLAN.
 - ctc: avoid compiler warnings.
 - lcs: write package sequence number to skb->cb.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] s390: z/VM monitor stream
Martin Schwidefsky [Thu, 2 Dec 2004 23:45:01 +0000 (15:45 -0800)]
[PATCH] s390: z/VM monitor stream

From: Gerald Schaefer <geraldsc@de.ibm.com>

z/VM monitor stream changes:
 - Add monitor control element to deal with end-of-frame records.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] s390: dasd driver
Martin Schwidefsky [Thu, 2 Dec 2004 23:44:48 +0000 (15:44 -0800)]
[PATCH] s390: dasd driver

From: Horst Hummel <horst.hummel@de.ibm.com>
From: Stefan Weinhuber <wein@de.ibm.com>

dasd driver changes:
 - Introduce "fixbuffers" dasd option that uses buffer pages for
   the dasd i/o similar to bounce buffers.
 - Fix I/O errors when using XRC.
 - Increment retry counter again if notifier callback is called with CIO_GONE.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] s390: dcss segments
Martin Schwidefsky [Thu, 2 Dec 2004 23:44:35 +0000 (15:44 -0800)]
[PATCH] s390: dcss segments

From: Carsten Otte <cotte@de.ibm.com>

dcss segment interface changes:
 - Add check when loading segments to avoid out of range mappings.
 - Add code to check for segment_load returning -ERANGE.
 - Rename segment_info to segment_type.
 - Restore previous segment state if reload fails.
 - Add segment_modify_shared() to change shared attributes of a dcss
   segment and use it in the dcss block device driver.
 - Add support for contiguous EW/EN multipart segments.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] s390: common i/o layer
Martin Schwidefsky [Thu, 2 Dec 2004 23:44:20 +0000 (15:44 -0800)]
[PATCH] s390: common i/o layer

From: Cornelia Huck <cohuck@de.ibm.com>
From: Steffen Thoss <thoss@de.ibm.com>

common i/o layer changes:
 - Delay re-registration of a subchannel with a different subchannel id
   until the ccw device removal triggered from the subchannels remove
   function has completed.
 - Fix check when to call unreg_rereg.
 - Fix get_disc_cdev_by_devno.
 - Activate the time delay disablement facility. This saves a few cycles
   in millicode processing.
 - Don't ifdef reset of busy start time.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] s390: core changes
Martin Schwidefsky [Thu, 2 Dec 2004 23:44:08 +0000 (15:44 -0800)]
[PATCH] s390: core changes

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

s390 core changes:
 - Remove defines for kernel_stack_size and async_stack_size.
 - Reserve system call number for kexec.
 - Add cc-option check for new gcc option packed-stack.
 - Fix race on no_hz_cpu_mask in stop_hz_timer.
 - Fix ptrace to make it send a SIGTRAP before the first instruction
   of a single stepped signal handler is executed.
 - Use force_sig_info with a full siginfo structure for illegal operation.
 - Remove verbatim copy of si_codes from asm-s390/siginfo.h. Use the
   generic definitions.
 - Regenerate default configuration.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] Work around devices with bogus media change indication on the first open
Alexander Viro [Thu, 2 Dec 2004 23:43:53 +0000 (15:43 -0800)]
[PATCH] Work around devices with bogus media change indication on the first open

What that patch does is making the first open _always_ assume that we need to
revalidate/reread partition table and kills partition-parsing in
register_disk(); instead we just have it do open/close and let the
revalidation path in open do the job.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] blkdev_get_blocks(): handle eof
Andrew Morton [Thu, 2 Dec 2004 23:43:41 +0000 (15:43 -0800)]
[PATCH] blkdev_get_blocks(): handle eof

For reasons which escape me, blockdev_get_blocks() is returning -EIO if the
mapping request straddles the end of the disk.  This causes reads which
straddle end-of-disk to return -EIO.

Fix it up so that it correctly trims the returned result down to match the
size of the device, for both reads and writes.

If a write attempt is fully beyond end-of-device then return -EIO.  We never
get this far anyway, because generic_write_checks() will return -ENOSPC if all
of the write lies outside a blockdev's i_size.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] revert the "dio handle eof" fix
Andrew Morton [Thu, 2 Dec 2004 23:43:27 +0000 (15:43 -0800)]
[PATCH] revert the "dio handle eof" fix

This recent fix isn't quite right: it is causing smaller-than-expected I/Os to
be submitted when extending files, which causes AIO-based writes to oops.

So just revert it - the bug was really over in blockdev_get_blocks() anyway.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] DAC960: Don't look at PCI_Device->irq before calling pci_enable_device().
Bjorn Helgaas [Thu, 2 Dec 2004 00:33:06 +0000 (16:33 -0800)]
[PATCH] DAC960: Don't look at PCI_Device->irq before calling pci_enable_device().

The DAC960 driver looks at PCI_Device->irq before calling
pci_enable_device(), which means it requests the wrong IRQ and hangs.
This fixes it.

Thanks to Johannes Rommel for reporting the problem and testing the fix.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years agoMerge bk://gkernel.bkbits.net/libata-2.6
Linus Torvalds [Wed, 1 Dec 2004 23:26:08 +0000 (15:26 -0800)]
Merge bk://gkernel.bkbits.net/libata-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge pobox.com:/garz/repo/linux-2.6
Jeff Garzik [Wed, 1 Dec 2004 20:31:57 +0000 (15:31 -0500)]
Merge pobox.com:/garz/repo/linux-2.6
into pobox.com:/garz/repo/libata-2.6

21 years ago[PATCH] eth1394: use SET_NETDEV_DEV() for udev
Randy Dunlap [Wed, 1 Dec 2004 09:11:55 +0000 (01:11 -0800)]
[PATCH] eth1394: use SET_NETDEV_DEV() for udev

Use SET_NETDEV_DEV() so that the device works correctly with udev.

Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] make number of ramdisks Kconfigurable
Marc Leeman [Wed, 1 Dec 2004 09:11:41 +0000 (01:11 -0800)]
[PATCH] make number of ramdisks Kconfigurable

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] fix typo in cdrom.c
Edward Falk [Wed, 1 Dec 2004 09:11:27 +0000 (01:11 -0800)]
[PATCH] fix typo in cdrom.c

Bug in dvd_read_manufact found by inspection.

Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] Documentation for IDE and CDROM ioctls
Edward Falk [Wed, 1 Dec 2004 09:11:14 +0000 (01:11 -0800)]
[PATCH] Documentation for IDE and CDROM ioctls

I've written two document files, and packaged them as a patch.

Two things caught my eye while I was writing this up:

The header comments for CDROMREADRAW, CDROMREADMODE1, and CDROMREADMODE2
disagree with the actual source code.  The header comments imply that a
cdrom_read structure is used to pass data, but the source code actually
reads a cdrom_msf structure and then overwrites it with raw data.  I'm not
sure if there's a bug in the header comments, in the driver source, or I
misread something.

The CDROM_LOCKDOOR ioctl seems to lock/unlock all doors on all drives,
because it uses a global variable.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] yenta: don't enable read prefetch on older o2 bridges.
Daniel Ritz [Wed, 1 Dec 2004 09:11:00 +0000 (01:11 -0800)]
[PATCH] yenta: don't enable read prefetch on older o2 bridges.

It turns out that just blindly enabling read prefetch is wrong for the
older (and buggy) oz6833 bridge.  fixed in the attached patch.

- don't touch the oz6832/6833
- more verbose
- only set the read prefetch and the write burst bits

it broke on some old laptop with a cardbus tulip.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] yenta_socket.c: Fix missing pci_disable_dev
Thomas Gleixner [Wed, 1 Dec 2004 09:10:46 +0000 (01:10 -0800)]
[PATCH] yenta_socket.c: Fix missing pci_disable_dev

Simple fix to make pci_enable/disable symetric and avoid the warning on
module unload.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] Add PCI-quirks for ASUS M6Ne notebook
Iacopo Spalletti [Wed, 1 Dec 2004 09:10:33 +0000 (01:10 -0800)]
[PATCH] Add PCI-quirks for ASUS M6Ne notebook

Added M6Ne PCI IDs in asus_hides_smbus_hostbridge() function

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] Fix occasional stop_machine() lockup with > 2 CPUs
Rusty Russell [Wed, 1 Dec 2004 09:10:19 +0000 (01:10 -0800)]
[PATCH] Fix occasional stop_machine() lockup with > 2 CPUs

Stephen Rothwell noted a case where one CPU was sitting in userspace, one
in stop_machine() waiting for everyone to enter stopmachine().  This can
happen if migration occurs at exactly the wrong time with more than 2 CPUS.
 Say we have 4 CPUS:

1) stop_machine() on CPU 0creates stopmachine() threads for CPUS 1, 2
   and 3, and yields waiting for them to migrate to their CPUs and
   ack.

2) stopmachine(2) gets rebalanced (probably on exec) to CPU 1.

3) stopmachine(2) calls set_cpus_allowed on CPU 1, sleeps awaiting
   migration thread.

4) stopmachine(1) calls set_cpus_allowed on CPU 0, moves onto CPU1 and
   starts spinning.

Now the migration thread never runs, and we deadlock.  The simplest
solution is for stopmachine() to yield until they are all in place.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] Fix parameter handling in ibm_acpi.c
Rusty Russell [Wed, 1 Dec 2004 09:10:06 +0000 (01:10 -0800)]
[PATCH] Fix parameter handling in ibm_acpi.c

You can't call module_param et al inside a function.  It doesn't make
sense, and it doesn't work.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] generic_make_request stack savings
Andrew Morton [Wed, 1 Dec 2004 09:09:52 +0000 (01:09 -0800)]
[PATCH] generic_make_request stack savings

Move this error-handling into a separate function so that its sizeable stack
utilisation is avoided - generic_make_request() can be called recursively by
stacking drivers.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] Fix an XFS direct I/O deadlock
Nathan Scott [Wed, 1 Dec 2004 09:09:39 +0000 (01:09 -0800)]
[PATCH] Fix an XFS direct I/O deadlock

Here's a patch which fixes the deadlock Brad Fitzpatrick reported here:
http://lkml.org/lkml/2004/11/14/98

The meat of the problem is a locking order reversal between the XFS I/O
lock and the inode semaphore (i_sem).  When we mix a number of threads
doing both direct reads and writes, we hit an ABBA deadlock after a while
because direct-io.c is taking and dropping i_sem after the XFS read path
has already taken its I/O lock.  This is the wrong way around from XFS's
point of view, in particular its the opposite order to the XFS write path.
So this patch changes the logic for direct reads in the DIO_OWN_LOCKING
case (i.e.  XFS-only case), but leaves things as is for the other two types
of locking.

Not real pretty, but fixes up the lock ordering and deadlock.

Oh, I have tested direct reads and writes on ext3 and block devices as
well, to ensure they still function correctly with the change (i.e.  they
don't regress, should be a no-op there) which covers the other locking
cases in __blockdev_direct_IO.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] cont_prepare_write() fix
Hirofumi Ogawa [Wed, 1 Dec 2004 09:09:25 +0000 (01:09 -0800)]
[PATCH] cont_prepare_write() fix

When cont_prepare_write() is padding out the "hole" with zeroed pages it
doesn't increase i_size at the same time.  If writeback comes in during the
execution of cont_prepare_write(), block_write_full_page() will think that
these pages are outside i_size and will just clean the page without writing
it.

Fix that up by using generic_commit_write(), which will advance i_size for
each page as it is dirtied.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] i4l: fix deadlock in CAPI code, reenable SMP
Karsten Keil [Wed, 1 Dec 2004 09:09:11 +0000 (01:09 -0800)]
[PATCH] i4l: fix deadlock in CAPI code, reenable SMP

This patch fix a deadlock in CAPI device driver registration code and
reenable SMP for the activ AVM cards., also some minor cleanup and fixes.

Signed-off-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] media: Update drivers/media/video/arv.c
Hirokazu Takata [Wed, 1 Dec 2004 09:08:58 +0000 (01:08 -0800)]
[PATCH] media: Update drivers/media/video/arv.c

Here is a patch to update AR camera device driver.

drivers/media/video/arv.c:

- Remove warnings; use module_param() instead of MODULE_PARM(), because
  MODULE_PARM() is deprecated.

- Fix white-space damages.

Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] swsusp kconfig: Change in wording
Pavel Machek [Wed, 1 Dec 2004 09:08:44 +0000 (01:08 -0800)]
[PATCH] swsusp kconfig: Change in wording

Vadim says:

I was reading through the kernel/power/Kconfig file, and noticed that
the wording was slightly unclear. I poked at it a bit, hopefully making
the description a tad more straightforward, but you be the judge. :)
Diffed against 2.6.10-rc2.

From: Vadim Lobanov <vlobanov@speakeasy.net>
Signed-off-by: Vadim Lobanov <vlobanov@speakeasy.net>
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] md: fix jiffies handling in md.c
Neil Brown [Wed, 1 Dec 2004 09:08:30 +0000 (01:08 -0800)]
[PATCH] md: fix jiffies handling in md.c

Use time_after_eq instead of >=

From: Michal Schmidt <xschmi00@stud.feec.vutbr.cz>
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>
21 years ago[PATCH] md: fix careless bug in raid10
Neil Brown [Wed, 1 Dec 2004 09:08:17 +0000 (01:08 -0800)]
[PATCH] md: fix careless bug in raid10

raid10 performs resync by reading all blocks, comparing to look for The
requires re-tasking a bio that was used to read, so that it can be re-used
for write.  So a number of fields need to be reset.

The bi_bdev field was not being reset.  However when using on a partition
of a device, it gets changed by generic_make_request.

This patch simply resets bi_bdev to the correct value.

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>
21 years ago[PATCH] Buffer overrun in arch/x86_64/sys_ia32.c:sys32_ni_syscall()
Jeremy Fitzhardinge [Wed, 1 Dec 2004 09:08:01 +0000 (01:08 -0800)]
[PATCH] Buffer overrun in arch/x86_64/sys_ia32.c:sys32_ni_syscall()

With Chris Wright <chrisw@osdl.org>

struct task_struct.comm is defined to be 16 chars, but
arch/x86_64/sys_ia32.c:sys32_ni_syscall() and sys32_vm86_warning() copy it
into a static 8 byte buffer, which will surely cause problems.  This patch
makes lastcomm[] the right size, and makes sure it can't be overrun.  Since
the code also goes to the effort of getting a local copy of current in "me",
we may as well use it for printing the message.

Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[PATCH] MIPS updates
Ralf Bächle [Wed, 1 Dec 2004 09:07:46 +0000 (01:07 -0800)]
[PATCH] MIPS updates

 o General updates of MIPS to 2.6.10-rc2
 o Remove the Baget platform due to lack of maintenance over several years.
   Some of the drivers remain and will be removed in a separate patch.
 o Remove the HP Laserjet platform.  No user reports ever and no patches from
   the original submitters made this port a neat hack - and a directory full
   of clutter.
 o SMP support for the PMC-Sierra.

Signed-Off-By: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years agoMerge bk://bk.arm.linux.org.uk/linux-2.6-rmk
Linus Torvalds [Wed, 1 Dec 2004 08:45:06 +0000 (00:45 -0800)]
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years ago[ARM PATCH] 2283/1: SA1100 USB Config options
Holger Freyther [Wed, 1 Dec 2004 16:23:46 +0000 (16:23 +0000)]
[ARM PATCH] 2283/1: SA1100 USB Config options

Patch from Holger Hans Peter Freyther

arch/arm/mach-sa1100/KConfig had options for USB client. The related code was removed early in 2.6. releases.
I think it is appropriate to remove the Config options for it itself, as they're void.

Signed-off-by: Holger Hans Peter Freyther
Signed-off-by: Russell King
21 years ago[ARM] omap: remove unnecessary linux/device.h include.
Russell King [Wed, 1 Dec 2004 16:17:38 +0000 (16:17 +0000)]
[ARM] omap: remove unnecessary linux/device.h include.

21 years ago[ARM PATCH] 2201/1: OMAP timer 1/2: Clean-up MPU timer
Tony Lindgren [Wed, 1 Dec 2004 15:53:40 +0000 (15:53 +0000)]
[ARM PATCH] 2201/1: OMAP timer 1/2: Clean-up MPU timer

Patch from Tony Lindgren

This patch by Tuukka Tikkanen & me cleans up the OMAP MPU timer
code to allow adding 32KHz timer support. Functionality is the
same as earlier.

Signed-off-by: Tony Lindgren
Signed-off-by: Russell King
21 years ago[ARM PATCH] 2287/1: remove bogus EXPORT_SYMBOL(*)
Nicolas Pitre [Wed, 1 Dec 2004 15:48:51 +0000 (15:48 +0000)]
[ARM PATCH] 2287/1: remove bogus EXPORT_SYMBOL(*)

Patch from Nicolas Pitre

Those functions are marked __init and called from __init context
as well.  They have no business with modules what so ever.

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King
21 years agoMerge bk://bk.arm.linux.org.uk/linux-2.6-mmc
Linus Torvalds [Wed, 1 Dec 2004 08:42:58 +0000 (00:42 -0800)]
Merge bk://bk.arm.linux.org.uk/linux-2.6-mmc
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years ago[ARM PATCH] 2288/1: unlink MMC DMA on driver exit
Nicolas Pitre [Wed, 1 Dec 2004 16:32:14 +0000 (16:32 +0000)]
[ARM PATCH] 2288/1: unlink MMC DMA on driver exit

Patch from Nicolas Pitre

Signed-off-by: Nicolas Pitre
Signed-off-by: Russell King
21 years agoMerge bk://linux-acpi.bkbits.net/26-latest-release
Linus Torvalds [Wed, 1 Dec 2004 08:40:40 +0000 (00:40 -0800)]
Merge bk://linux-acpi.bkbits.net/26-latest-release
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge intel.com:/home/lenb/src/26-stable-dev
Len Brown [Wed, 1 Dec 2004 13:28:14 +0000 (08:28 -0500)]
Merge intel.com:/home/lenb/src/26-stable-dev
into intel.com:/home/lenb/src/26-latest-dev

21 years ago[ACPI] update C-state limiting patch
Len Brown [Wed, 1 Dec 2004 13:25:01 +0000 (08:25 -0500)]
[ACPI] update C-state limiting patch

Now "max_cstate=" instead of "acpi_cstate_limit="
Delete redundant static cstate flags .c2 and .c3

http://bugme.osdl.org/show_bug.cgi?id=3549

   For static processor driver, boot cmdline:
   processor.max_cstate=2

   For processor module, /etc/modprobe.conf:
   options processor max_cstate=2
   or
   # modprobe processor max_cstate=2

   From kernel or kernel module:
   #include <linux/acpi.h>
   acpi_set_cstate_limit(2);

Suggested-by: Pavel Machek
Signed-off-by: Len Brown <len.brown@intel.com>
21 years agoMerge intel.com:/home/lenb/src/26-stable-dev
Len Brown [Wed, 1 Dec 2004 09:01:40 +0000 (04:01 -0500)]
Merge intel.com:/home/lenb/src/26-stable-dev
into intel.com:/home/lenb/src/26-latest-dev

21 years ago[ACPI] disable LAPIC at reboot and poweroff if Linux forced it on
Len Brown [Wed, 1 Dec 2004 08:59:57 +0000 (03:59 -0500)]
[ACPI] disable LAPIC at reboot and poweroff if Linux forced it on
http://bugzilla.kernel.org/show_bug.cgi?id=3643

Signed-off-by: Alexey Y Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Len Brown <len.brown@intel.com>
21 years agoCset exclude: len.brown@intel.com[lenb]|ChangeSet|20041109085620|42985
Len Brown [Wed, 1 Dec 2004 07:40:31 +0000 (02:40 -0500)]
Cset exclude: len.brown@intel.com[lenb]|ChangeSet|20041109085620|42985

21 years agoMerge http://lia64.bkbits.net/linux-ia64-release-2.6.10
Linus Torvalds [Wed, 1 Dec 2004 07:18:02 +0000 (23:18 -0800)]
Merge http://lia64.bkbits.net/linux-ia64-release-2.6.10
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge intel.com:/home/lenb/bk/26-latest-ref
Len Brown [Tue, 30 Nov 2004 22:04:04 +0000 (17:04 -0500)]
Merge intel.com:/home/lenb/bk/26-latest-ref
into intel.com:/home/lenb/src/26-latest-dev

21 years agoMerge intel.com:/home/lenb/src/26-stable-dev
Len Brown [Tue, 30 Nov 2004 21:01:49 +0000 (16:01 -0500)]
Merge intel.com:/home/lenb/src/26-stable-dev
into intel.com:/home/lenb/src/26-latest-dev

21 years agomerge
Len Brown [Tue, 30 Nov 2004 20:59:02 +0000 (15:59 -0500)]
merge

21 years ago[ACPI] IPMI must supply the address of its GPE handler to install or remove it
Len Brown [Tue, 30 Nov 2004 20:36:30 +0000 (15:36 -0500)]
[ACPI] IPMI must supply the address of its GPE handler to install or remove it

Signed-off-by: Len Brown <len.brown@intel.com>
21 years ago[ACPI] fix reboot on poweroff regression due to enabled wakeup GPEs
Len Brown [Tue, 30 Nov 2004 20:05:10 +0000 (15:05 -0500)]
[ACPI] fix reboot on poweroff regression due to enabled wakeup GPEs
http://bugzilla.kernel.org/show_bug.cgi?id=3669

Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
21 years ago[ACPI] fix IRQ assignment regression with CONFIG_PNPACPI=y
Len Brown [Tue, 30 Nov 2004 19:46:34 +0000 (14:46 -0500)]
[ACPI] fix IRQ assignment regression with CONFIG_PNPACPI=y
http://bugzilla.kernel.org/show_bug.cgi?id=3762

Signed-off-by: Len Brown <len.brown@intel.com>
21 years agoMerge bk://kernel.bkbits.net/davem/net-2.6
Linus Torvalds [Tue, 30 Nov 2004 15:11:50 +0000 (07:11 -0800)]
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years ago[GNET_STATS]: kernel-api doc for gnet stats/estimator
Thomas Graf [Tue, 30 Nov 2004 14:02:46 +0000 (06:02 -0800)]
[GNET_STATS]: kernel-api doc for gnet stats/estimator

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[ACPI] platform_rename_gsi() is no longer limited to ACPI specific code,
Len Brown [Tue, 30 Nov 2004 13:39:31 +0000 (08:39 -0500)]
[ACPI] platform_rename_gsi() is no longer limited to ACPI specific code,
so call it ioapic_renumber_irq().

A note to google:
GSI is a Global System Interrupt -- a flat, linear, global IRQ number.

Suggested-by: Linus Torvalds
Signed-off-by: Len Brown <len.brown@intel.com>
21 years ago[UDP]: Select handling of bad checksums.
Stephen Hemminger [Tue, 30 Nov 2004 13:26:12 +0000 (05:26 -0800)]
[UDP]: Select handling of bad checksums.

Alternate workaround for blocking usage of select() by UDP applications.
The problem is Linux optimizes the UDP receive checksum path so that checksum
validation is not performed until the application read. This is a performance win
but can cause applications that do select with blocking file descriptors to get false
positives if the received message has a checksum error.
There is a long running thread about this on LKML.

This patch makes these applications work, but keeps the one-pass performance gain
for those applications smart enough to use non-blocking file descriptors with
select/poll. There is still a possibility to get a false positive if application does
select on non-blocking fd then makes it blocking before doing the receive, but that
is unlikely.

Tested by injecting bad packets with SOCK_RAW.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years agoMerge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
Linus Torvalds [Tue, 30 Nov 2004 13:16:37 +0000 (05:16 -0800)]
Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge bk://kernel.bkbits.net/gregkh/linux/i2c-2.6
Linus Torvalds [Tue, 30 Nov 2004 13:15:28 +0000 (05:15 -0800)]
Merge bk://kernel.bkbits.net/gregkh/linux/i2c-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge bk://kernel.bkbits.net/gregkh/linux/pci-2.6
Linus Torvalds [Tue, 30 Nov 2004 13:12:13 +0000 (05:12 -0800)]
Merge bk://kernel.bkbits.net/gregkh/linux/pci-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge intel.com:/home/lenb/src/26-stable-dev
Len Brown [Tue, 30 Nov 2004 12:11:31 +0000 (07:11 -0500)]
Merge intel.com:/home/lenb/src/26-stable-dev
into intel.com:/home/lenb/src/26-latest-dev

21 years agoMerge intel.com:/home/lenb/bk/26-latest-ref
Len Brown [Tue, 30 Nov 2004 08:22:54 +0000 (03:22 -0500)]
Merge intel.com:/home/lenb/bk/26-latest-ref
into intel.com:/home/lenb/src/26-latest-dev

21 years ago[ACPI] fix build errors resulting from auto-merge
Len Brown [Tue, 30 Nov 2004 08:15:50 +0000 (03:15 -0500)]
[ACPI] fix build errors resulting from auto-merge

Signed-off-by: Len Brown <len.brown@intel.com>
21 years agoMerge kroah.com:/home/greg/linux/BK/bleed-2.6
Greg Kroah-Hartman [Tue, 30 Nov 2004 07:42:41 +0000 (23:42 -0800)]
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/i2c-2.6

21 years ago[PATCH] W1: check nls in return path.
Evgeniy Polyakov [Tue, 30 Nov 2004 07:23:40 +0000 (23:23 -0800)]
[PATCH] W1: check nls in return path.

Check netlink socket being non NULL in error return path.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years agoMerge kroah.com:/home/greg/linux/BK/bleed-2.6
Greg Kroah-Hartman [Tue, 30 Nov 2004 07:20:36 +0000 (23:20 -0800)]
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/pci-2.6

21 years agoMerge kroah.com:/home/greg/linux/BK/bleed-2.6
Greg Kroah-Hartman [Tue, 30 Nov 2004 07:14:45 +0000 (23:14 -0800)]
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/usb-2.6

21 years ago[NET]: Missing security_*() check in net/compat.c
Mitchell Blank Jr. [Tue, 30 Nov 2004 05:17:23 +0000 (21:17 -0800)]
[NET]: Missing security_*() check in net/compat.c

While looking at the SCM passing code in net/core/scm.c I noticed that there's
a 32-bit compat implementation of scm_detach_fds()'s called
scm_detach_fds_compat() living in net/compat.c.  While these two functions
are mostly the same the latter does not include the call to the
security_file_receive() hook which is almost certainly a bug.

Signed-off-by: Mitchell Blank Jr <mitch@sfgoth.com>
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[PKTGEN]: Clean error count before each run.
Scott Feldman [Tue, 30 Nov 2004 05:15:36 +0000 (21:15 -0800)]
[PKTGEN]: Clean error count before each run.

Signed-off-by: Scott Feldman <sfeldma@pobox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years agoUSB: move a internal usbfs only structure out of a public header file.
Greg Kroah-Hartman [Tue, 30 Nov 2004 04:10:16 +0000 (20:10 -0800)]
USB: move a internal usbfs only structure out of a public header file.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years agoPCI: fix build warning in pci-sysfs.c
Greg Kroah-Hartman [Tue, 30 Nov 2004 03:54:13 +0000 (19:54 -0800)]
PCI: fix build warning in pci-sysfs.c

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years ago[IA64] if idle doesn't halt, it should at least relax
Tony Luck [Tue, 30 Nov 2004 01:07:03 +0000 (17:07 -0800)]
[IA64] if idle doesn't halt, it should at least relax

Asit Mallick pointed out that the ia64 idle loop needs a
"hint @pause" instruction in the cases where we don't
actually halt the cpu.

Acked-by: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years ago[IA64] Bigsur config: Add CONFIG_SERIAL_8250_ACPI so we can find serial devices
Bjorn Helgaas [Tue, 30 Nov 2004 00:51:09 +0000 (16:51 -0800)]
[IA64] Bigsur config: Add CONFIG_SERIAL_8250_ACPI so we can find serial devices

In the absence of an HCDP, we used to assume there were legacy COM ports
at 0x3f8 and 0x2f8, but I recently removed that assumption.

"console=ttyS0" still works (assuming you have CONFIG_SERIAL_8250_ACPI
turned on so you can find the ttyS0 device), but the console doesn't
start working until the serial driver initializes.  If you need an
early console and you know where it lives, something like
"console=uart,io,0x3f8" will start working very early.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
21 years agoMerge http://linux-watchdog.bkbits.net/linux-2.6-watchdog
Linus Torvalds [Tue, 30 Nov 2004 00:14:59 +0000 (16:14 -0800)]
Merge http://linux-watchdog.bkbits.net/linux-2.6-watchdog
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years agoMerge http://linux-watchdog.bkbits.net/linux-2.6-watchdog-mm
Wim Van Sebroeck [Tue, 30 Nov 2004 10:01:31 +0000 (11:01 +0100)]
Merge http://linux-watchdog.bkbits.net/linux-2.6-watchdog-mm
into iguana.be:/home/wim/BitKeeper/projects/linux-2.6-watchdog

21 years ago[PATCH] cfq-iosched: kill show_status sysfs entry
Jens Axboe [Tue, 30 Nov 2004 00:12:38 +0000 (16:12 -0800)]
[PATCH] cfq-iosched: kill show_status sysfs entry

This is a debug entry that isn't of much use to the generic user or on a
production system. Additionally it can also easy overflow the sysfs
PAGE_SIZE limitation, if you have many processes doing io. So kill the
entry.

Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years agoMerge bk://kernel.bkbits.net/davem/net-2.6
Linus Torvalds [Mon, 29 Nov 2004 12:46:03 +0000 (04:46 -0800)]
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years ago[PATCH] Remove Futex Warning
Rusty Russell [Mon, 29 Nov 2004 12:24:39 +0000 (04:24 -0800)]
[PATCH] Remove Futex Warning

If we're waiting on a futex and we are woken up, it's either because
someone did FUTEX_WAKE, we timed out, or have been signalled.  However, the
WARN_ON(!signal_pending(current)) test is overzealous: with threads (a
common use of futexes), we share the signal handler and the other
thread might get to the signal before us.  In addition, exit_notify()
can do a recalc_sigpending_tsk() on us, which will then clear our
TIF_SIGPENDING bit, making signal_pending(current) return false.

Returning EINTR is a little strange in this case, since this thread
hasn't handled a signal.  However, with threads it's the best we can
do: there's always a race where another thread could have been the
actual one to handle the signal.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
21 years ago[NET]: Fix inline keyword usage in skbuff.c
Jesper Juhl [Mon, 29 Nov 2004 11:45:22 +0000 (03:45 -0800)]
[NET]: Fix inline keyword usage in skbuff.c

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[DECNET]: Typo in accept causes OOPS.
Patrick Caulfield [Mon, 29 Nov 2004 11:32:57 +0000 (03:32 -0800)]
[DECNET]: Typo in accept causes OOPS.

Signed-off-by: Patrick Caulfield <patrick@tykepenguin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[IPV6]: Fix races in ip6_route_{input,output}()
Hideaki Yoshifuji [Mon, 29 Nov 2004 11:25:06 +0000 (03:25 -0800)]
[IPV6]: Fix races in ip6_route_{input,output}()

We need to hold refcnt before releasing rt6_lock.

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
21 years ago[IPV4]: Use schedule_timeout() instead of jiffies polling in ipconfig.
Magnus Damm [Mon, 29 Nov 2004 11:10:22 +0000 (03:10 -0800)]
[IPV4]: Use schedule_timeout() instead of jiffies polling in ipconfig.

Signed-off-by: David S. Miller <davem@davemloft.net>
21 years agoMerge bk://bk.skbuff.net:20610/linux-2.6-inet6/
David S. Miller [Mon, 29 Nov 2004 10:54:40 +0000 (02:54 -0800)]
Merge bk://bk.skbuff.net:20610/linux-2.6-inet6/
into nuts.davemloft.net:/disk1/BK/net-2.6

21 years ago[PATCH] USB touchkitusb: module_param to swap axes
Daniel Ritz [Mon, 29 Nov 2004 08:10:39 +0000 (00:10 -0800)]
[PATCH] USB touchkitusb: module_param to swap axes

add a module parameter to swap the axes. many displays need this...

Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years agoUSB: minor Makefile fix.
Greg Kroah-Hartman [Mon, 29 Nov 2004 08:09:20 +0000 (00:09 -0800)]
USB: minor Makefile fix.

This fixes http://bugme.osdl.org/show_bug.cgi?id=3813

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
21 years agoMerge bk://bk.arm.linux.org.uk/linux-2.6-rmk
Linus Torvalds [Mon, 29 Nov 2004 07:52:14 +0000 (23:52 -0800)]
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux

21 years ago[ARM PATCH] 2285/1: S3C2410 - regs-sdi.h fixes
Ben Dooks [Mon, 29 Nov 2004 15:23:14 +0000 (15:23 +0000)]
[ARM PATCH] 2285/1: S3C2410 - regs-sdi.h fixes

Patch from Ben Dooks

Fixes from Koen Martens to update the
register definitions for the MMC/SD/SDIO interface,
tidied up for release with extra notes on what has
been depreceated in later silicon.

Signed-off-by: Koen Martens
Signed-off-by: Ben Dooks
Signed-off-by: Russell King
21 years ago[ARM PATCH] 2284/1: S3C2410 - core device registration update
Ben Dooks [Mon, 29 Nov 2004 15:17:44 +0000 (15:17 +0000)]
[ARM PATCH] 2284/1: S3C2410 - core device registration update

Patch from Ben Dooks

If one of the devices fails to register, do not
remove any registered devices and continue registering
in case any more devices register.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King