15 years ago[PATCH] Input: ucb1400 - set up driver's name to show in sysfs
Cliff Brake [Tue, 10 Apr 2007 03:50:50 +0000 (23:50 -0400)]
[PATCH] Input: ucb1400 - set up driver's name to show in sysfs

The UCB1400 is missing a name parameter in the device_driver struct.
This causes missing information in the /sys tree and seems to cause
other problems with the AC97 functionality. This was tested on a PXA270

Signed-off-by: Cliff Brake <>
Signed-off-by: Dmitry Torokhov <>
Signed-off-by: Linus Torvalds <>
15 years agoMerge branch 'for-2.6.21' of
Linus Torvalds [Wed, 11 Apr 2007 00:24:56 +0000 (17:24 -0700)]
Merge branch 'for-2.6.21' of /linux/kernel/git/davej/agpgart

* 'for-2.6.21' of
  [AGPGART] intel_agp: fix G965 GTT size detect

15 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Wed, 11 Apr 2007 00:24:36 +0000 (17:24 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://
  ieee1394: change deprecation status of dv1394

15 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Wed, 11 Apr 2007 00:23:52 +0000 (17:23 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/roland/infiniband

* 'for-linus' of git://
  IPoIB/cm: Fix DMA direction typo
  IB/iser: Don't defer connection failure notification to workqueue

15 years agoMerge branch 'upstream-fixes' of git://
Linus Torvalds [Wed, 11 Apr 2007 00:23:36 +0000 (17:23 -0700)]
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/jikos/hid

* 'upstream-fixes' of git://
  HID: Do not discard truncated input reports

15 years agoMerge
Linus Torvalds [Wed, 11 Apr 2007 00:22:31 +0000 (17:22 -0700)]
Merge /pub/scm/linux/kernel/git/bart/ide-2.6

  ide: add "optical" to sysfs "media" attribute
  ide: ugly messages trying to open CD drive with no media present
  ide: correctly prevent IDE timer expiry function to run if request was already handled

15 years agoMerge
Linus Torvalds [Wed, 11 Apr 2007 00:22:16 +0000 (17:22 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

  [NETFILTER]: ipt_CLUSTERIP: fix oops in checkentry function
  [TCP]: slow_start_after_idle should influence cwnd validation too
  [SC92031]: Fix priv->lock context
  [NET_SCHED]: cls_tcindex: fix compatibility breakage

15 years agoMerge branch 'release' of git://
Linus Torvalds [Wed, 11 Apr 2007 00:21:57 +0000 (17:21 -0700)]
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

* 'release' of git://
  [IA64] SGI Altix : fix pcibr_dmamap_ate32() bug
  [IA64] Fix CPU freq displayed in /proc/cpuinfo
  [IA64] Fix wrong assumption about irq and vector in msi_ia64.c
  [IA64] BTE error timer fix

15 years agoide: add "optical" to sysfs "media" attribute
Danny Kukawka [Tue, 10 Apr 2007 20:39:14 +0000 (22:39 +0200)]
ide: add "optical" to sysfs "media" attribute

Add "optical" to sysfs "media" attribute as already in /proc

Signed-off-by: Danny Kukawka <>
Signed-off-by: Bartlomiej Zolnierkiewicz <>
15 years agoide: ugly messages trying to open CD drive with no media present
Stuart Hayes [Tue, 10 Apr 2007 20:38:43 +0000 (22:38 +0200)]
ide: ugly messages trying to open CD drive with no media present

I get the following error messages when trying to open a CD device
(specifically, the Teac CD-ROM CD-224E) that has no media present:

hda: packet command error: status=3D0x51 { DriveReady SeekComplete Error }
hda: packet command error: error=3D0x54 { AbortedCommand LastFailedSense=0x05 }
ide: failed opcode was: unknown

This happens when a "start stop unit" command (0x1b 0 0 0 3 0 0 0 0 0)
is sent to the drive to try to close the CD-ROM tray, but this drive
doesn't have that capability (it's a slim portable-type CD-ROM), so it
reports sense key 5 (illegal request) with asc/ascq 24/0.  This is
exactly how SFF8090i says it should respond.

But ide-cd.c (in cdrom_decode_status() ) just sees sense key 5 and spews
out an error.  It then goes on to request sense data, and
cdrom_log_sense() understands this error and doesn't log it.

The patch, for kernel, suppresses this error message.

Signed-off-by: Stuart Hayes <>
Cc: Alan Cox <>
Signed-off-by: Bartlomiej Zolnierkiewicz <>
15 years agoide: correctly prevent IDE timer expiry function to run if request was already handled
Suleiman Souhlal [Tue, 10 Apr 2007 20:38:37 +0000 (22:38 +0200)]
ide: correctly prevent IDE timer expiry function to run if request was already handled

It is possible for the timer expiry function to run even though the
request has already been handled: ide_timer_expiry() only checks that
the handler is not NULL, but it is possible that we have handled a
request (thus clearing the handler) and then started a new request
(thus starting the timer again, and setting a handler).

A simple way to exhibit this is to set the DMA timeout to 1 jiffy and
run dd: The kernel will panic after a few minutes because
ide_timer_expiry() tries to add a timer when it's already active.

To fix this, we simply add a request generation count that gets
incremented at every interrupt, and check in ide_timer_expiry() that
we have not already handled a new interrupt before running the expiry

Signed-off-by: Suleiman Souhlal <>
Signed-off-by: Bartlomiej Zolnierkiewicz <>
15 years ago[NETFILTER]: ipt_CLUSTERIP: fix oops in checkentry function
Jaroslav Kysela [Tue, 10 Apr 2007 20:26:48 +0000 (13:26 -0700)]
[NETFILTER]: ipt_CLUSTERIP: fix oops in checkentry function

The clusterip_config_find_get() already increases entries reference
counter, so there is no reason to do it twice in checkentry() callback.

This causes the config to be freed before it is removed from the list,
resulting in a crash when adding the next rule.

Signed-off-by: Jaroslav Kysela <>
Signed-off-by: Patrick McHardy <>
Signed-off-by: David S. Miller <>
15 years agoIPoIB/cm: Fix DMA direction typo
Michael S. Tsirkin [Tue, 10 Apr 2007 15:32:42 +0000 (18:32 +0300)]
IPoIB/cm: Fix DMA direction typo

Receive buffers need to be mapped with DMA_FROM_DEVICE.  Incorrectly
mapping with DMA_TO_DEVICE causes a hard lock on ppc64 machines with

This fixes <>

Signed-off-by: Michael S. Tsirkin <>
Signed-off-by: Roland Dreier <>
15 years ago[AGPGART] intel_agp: fix G965 GTT size detect
Wang Zhenyu [Tue, 10 Apr 2007 01:42:48 +0000 (09:42 +0800)]
[AGPGART] intel_agp: fix G965 GTT size detect

On G965, I810_PGETBL_CTL is a mmio offset, but we wrongly take it
as pci config space offset in detecting GTT size. This one line patch
fixs this.

Signed-off-by: Wang Zhenyu <>
Signed-off-by: Dave Jones <>
15 years ago[TCP]: slow_start_after_idle should influence cwnd validation too
David S. Miller [Mon, 9 Apr 2007 20:23:14 +0000 (13:23 -0700)]
[TCP]: slow_start_after_idle should influence cwnd validation too

For the cases that slow_start_after_idle are meant to deal
with, it is almost a certainty that the congestion window
tests will think the connection is application limited and
we'll thus decrease the cwnd there too.  This defeats the
whole point of setting slow_start_after_idle to zero.

So test it there too.

We do not cancel out the entire tcp_cwnd_validate() function
so that if the sysctl is changed we still have the validation
state maintained.

Signed-off-by: David S. Miller <>
15 years ago[SC92031]: Fix priv->lock context
Herbert Xu [Mon, 9 Apr 2007 18:51:15 +0000 (11:51 -0700)]
[SC92031]: Fix priv->lock context

The spin_lock calls made in dev->open and dev->close must disable
BH since open/close are made in process context.  Conversely, the
call in dev->hard_start_xmit does not need to disable BH since it
is already executing with BH disabled.

Signed-off-by: Herbert Xu <>
Signed-off-by: David S. Miller <>
15 years ago[NET_SCHED]: cls_tcindex: fix compatibility breakage
Patrick McHardy [Mon, 9 Apr 2007 18:42:25 +0000 (11:42 -0700)]
[NET_SCHED]: cls_tcindex: fix compatibility breakage

Userspace uses an integer for TCA_TCINDEX_SHIFT, the kernel was changed
to expect and use a u16 value in 2.6.11, which broke compatibility on
big endian machines. Change back to use int.

Reported by Ole Reinartz <>

Signed-off-by: Patrick McHardy <>
Signed-off-by: David S. Miller <>
15 years agoMerge branch 'for-2.6.21' of
Linus Torvalds [Mon, 9 Apr 2007 18:45:18 +0000 (11:45 -0700)]
Merge branch 'for-2.6.21' of /linux/kernel/git/davej/agpgart

* 'for-2.6.21' of
  [AGPGART] intel_agp: PCI id update for Intel 965GM

15 years agoieee1394: change deprecation status of dv1394
Stefan Richter [Wed, 21 Mar 2007 23:40:06 +0000 (00:40 +0100)]
ieee1394: change deprecation status of dv1394

Nobody ported ffmpeg from dv1394 to rawiso yet, and there is no
justification to remove dv1394 right now.

Nevertheless, a strong deprecation of this ABI makes a lot of sense,
especially as Kristian H's drivers shape up to be an attractive
alternative to the existing ones.  But we don't have a schedule at the

Signed-off-by: Stefan Richter <>
15 years ago[PATCH] i386: irqbalance_disable() section fix
Andrew Morton [Sun, 8 Apr 2007 23:04:04 +0000 (16:04 -0700)]
[PATCH] i386: irqbalance_disable() section fix

WARNING: arch/i386/kernel/built-in.o - Section mismatch: reference to .init.text:irqbalance_disable from .text between 'quirk_intel_irqbalance' (at offset 0x80a5) and 'i8237A_suspend'

Cc: Andi Kleen <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] x86_64 early quirks: fix early_qrk[] section tag
Andrew Morton [Sun, 8 Apr 2007 23:04:03 +0000 (16:04 -0700)]
[PATCH] x86_64 early quirks: fix early_qrk[] section tag

WARNING: arch/x86_64/kernel/built-in.o - Section mismatch: reference to .init.text:nvidia_bugs from .data between 'early_qrk' (at offset 0x8428) and 'enable_cpu_hotplug'
WARNING: arch/x86_64/kernel/built-in.o - Section mismatch: reference to .init.text:via_bugs from .data between 'early_qrk' (at offset 0x8438) and 'enable_cpu_hotplug'
WARNING: arch/x86_64/kernel/built-in.o - Section mismatch: reference to .init.text:ati_bugs from .data between 'early_qrk' (at offset 0x8448) and 'enable_cpu_hotplug'

The compiler is putting it into .data because the __initdata is in the wrong

Cc: Andi Kleen <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] omap_cf: oops-on-suspend fix
David Brownell [Sun, 8 Apr 2007 23:04:02 +0000 (16:04 -0700)]
[PATCH] omap_cf: oops-on-suspend fix

Convert omap_cf into a platform_driver ...  this resolves oopsing during

Evidently folk haven't tried suspend/resume on an OSK (the main platform
for this driver) since September or so, which is when platform_device
learned about suspend_late()/resume_early() and stopped being able to
suspend/resume without a platform_driver.

Signed-off-by: David Brownell <>
Cc: Dominik Brodowski <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] Proper fix for highmem kmap_atomic functions for VMI for 2.6.21
Zachary Amsden [Sun, 8 Apr 2007 23:04:01 +0000 (16:04 -0700)]
[PATCH] Proper fix for highmem kmap_atomic functions for VMI for 2.6.21

Since lazy MMU batching mode still allows interrupts to enter, it is
possible for interrupt handlers to try to use kmap_atomic, which fails when
lazy mode is active, since the PTE update to highmem will be delayed.  The
best workaround is to issue an explicit flush in kmap_atomic_functions
case; this is the only way nested PTE updates can happen in the interrupt

Thanks to Jeremy Fitzhardinge for noting the bug and suggestions on a fix.

This patch gets reverted again when we start 2.6.22 and the bug gets fixed

Signed-off-by: Zachary Amsden <>
Cc: Andi Kleen <>
Cc: Jeremy Fitzhardinge <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] fuse: validate rootmode mount option
Timo Savola [Sun, 8 Apr 2007 23:04:00 +0000 (16:04 -0700)]
[PATCH] fuse: validate rootmode mount option

If rootmode isn't valid, we hit the BUG() in fuse_init_inode.  Now
EINVAL is returned.

Signed-off-by: Timo Savola <>
Signed-off-by: Miklos Szeredi <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[AGPGART] intel_agp: PCI id update for Intel 965GM
Wang Zhenyu [Mon, 9 Apr 2007 00:51:36 +0000 (08:51 +0800)]
[AGPGART] intel_agp: PCI id update for Intel 965GM

Update PCI id info for Intel 965GM chipset.

Signed-off-by: Wang Zhenyu <>
Signed-off-by: Dave Jones <>
15 years agosched.c: Remove unused variable 'relative'
Linus Torvalds [Sat, 7 Apr 2007 17:18:33 +0000 (10:18 -0700)]
sched.c: Remove unused variable 'relative'

Getting rid of the p->children printout in show_task() left behind an
unused variable.

Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] sched: get rid of p->children use in show_task()
Ingo Molnar [Fri, 6 Apr 2007 19:18:06 +0000 (21:18 +0200)]
[PATCH] sched: get rid of p->children use in show_task()

the p->parent PID printout gives us all the information about the
task tree that we need - the eldest_child()/older_sibling()/
younger_sibling() printouts are mostly historic and i do not
remember ever having used those fields. (IMO in fact they confuse
the SysRq-T output.) So remove them.

This code has sentimental value though, those fields and
printouts are one of the oldest ones still surviving from
Linux v0.95's kernel/sched.c:

        if (p->p_ysptr || p->p_osptr)
                printk("   Younger sib=%d, older sib=%d\n\r",
                        p->p_ysptr ? p->p_ysptr->pid : -1,
                        p->p_osptr ? p->p_osptr->pid : -1);

written 15 years ago, in early 1992.

Signed-off-by: Ingo Molnar <>
Signed-off-by: Linus 'snif' Torvalds <>
15 years ago[PATCH] irq-devres: fix failure path of devm_request_irq()
Tejun Heo [Sat, 7 Apr 2007 05:59:41 +0000 (14:59 +0900)]
[PATCH] irq-devres: fix failure path of devm_request_irq()

devres should be deallocated with devres_free() not kfree().  This bug
corrupts slab on IRQ request failure.  Fix it.

Signed-off-by: Tejun Heo <>
Cc: Andrew Morton <>
Cc: Greg KH <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] high-res timers: resume fix
Ingo Molnar [Sat, 7 Apr 2007 10:05:00 +0000 (12:05 +0200)]
[PATCH] high-res timers: resume fix

Soeren Sonnenburg reported that upon resume he is getting
this backtrace:

 [<c0119637>] smp_apic_timer_interrupt+0x57/0x90
 [<c0142d30>] retrigger_next_event+0x0/0xb0
 [<c0104d30>] apic_timer_interrupt+0x28/0x30
 [<c0142d30>] retrigger_next_event+0x0/0xb0
 [<c0140068>] __kfifo_put+0x8/0x90
 [<c0130fe5>] on_each_cpu+0x35/0x60
 [<c0143538>] clock_was_set+0x18/0x20
 [<c0135cdc>] timekeeping_resume+0x7c/0xa0
 [<c02aabe1>] __sysdev_resume+0x11/0x80
 [<c02ab0c7>] sysdev_resume+0x47/0x80
 [<c02b0b05>] device_power_up+0x5/0x10

it turns out that on resume we mistakenly re-enable interrupts too
early.  Do the timer retrigger only on the current CPU.

Signed-off-by: Ingo Molnar <>
Acked-by: Thomas Gleixner <>
Acked-by: Soeren Sonnenburg <>
Signed-off-by: Linus Torvalds <>
15 years agoMerge
Linus Torvalds [Sat, 7 Apr 2007 01:15:30 +0000 (18:15 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

  [TG3]: Fix crash during tg3_init_one().
  [IPV6]: Revert recent change to rt6_check_dev().
  [XFRM]: beet: fix IP option decapsulation
  [XFRM]: beet: fix beet mode decapsulation
  [XFRM]: beet: use IPOPT_NOP for option padding
  [XFRM]: beet: fix IP option encapsulation

15 years ago[TG3]: Fix crash during tg3_init_one().
Michael Chan [Sat, 7 Apr 2007 00:35:37 +0000 (17:35 -0700)]
[TG3]: Fix crash during tg3_init_one().

The driver will crash when the chip has been initialized by EFI before
tg3_init_one().  In this case, the driver will call tg3_chip_reset()
before allocating consistent memory.

The bug is fixed by checking for tp->hw_status before accessing it
during tg3_chip_reset().

Signed-off-by: Michael Chan <>
Signed-off-by: David S. Miller <>
15 years ago[IA64] SGI Altix : fix pcibr_dmamap_ate32() bug
Mike Habeck [Fri, 6 Apr 2007 17:04:39 +0000 (12:04 -0500)]
[IA64] SGI Altix : fix pcibr_dmamap_ate32() bug

On a SGI Altix TIOCP based PCI bus we need to include the ATE_PIO attribute
bit if we're mapping a 32bit MSI address.

Signed-off-by: Mike Habeck <>
Signed-off-by: Tony Luck <>
15 years ago[IA64] Fix CPU freq displayed in /proc/cpuinfo
Venki Pallipadi [Fri, 6 Apr 2007 17:04:49 +0000 (10:04 -0700)]
[IA64] Fix CPU freq displayed in /proc/cpuinfo

My patch: git commit=95235ca2c20ac0b31a8eb39e2d599bcc3e9c9a10 introduced a bug
in IA64 cpuinfo output.

Patch changed the proc_freq from 1HZ resolution to 1KHz resolution, but left
format string unchanged at " %lu.%06lu". Below is the fix.

Thanks to Bjorn for catching this.

Signed-off-by: Venkatesh Pallipadi <>
Signed-off-by: Tony Luck <>
15 years ago[IA64] Fix wrong assumption about irq and vector in msi_ia64.c
Ishimatsu Yasuaki [Fri, 6 Apr 2007 07:51:12 +0000 (16:51 +0900)]
[IA64] Fix wrong assumption about irq and vector in msi_ia64.c

This patch fixes a wrong assumption in ia64 MSI code that IRQ equals

Signed-off-by: Kenji Kaneshige <>
Signed-off-by: Yasuaki Ishimatsu <>
Signed-off-by: Tony Luck <>
15 years ago[IA64] BTE error timer fix
Russ Anderson [Fri, 30 Mar 2007 22:13:18 +0000 (17:13 -0500)]
[IA64] BTE error timer fix

The bte recovery_timer was not being set correctly.

Signed-off-by: Russ Anderson <>
Signed-off-by: Tony Luck <>
15 years ago[IPV6]: Revert recent change to rt6_check_dev().
David S. Miller [Fri, 6 Apr 2007 18:42:27 +0000 (11:42 -0700)]
[IPV6]: Revert recent change to rt6_check_dev().

This reverts a0d78ebf3a0e33a1aeacf2fc518ad9273d6a1c2f

It causes pings to link-local addresses to fail.

Signed-off-by: David S. Miller <>
15 years agoLinux 2.6.21-rc6
Linus Torvalds [Fri, 6 Apr 2007 02:36:56 +0000 (19:36 -0700)]
Linux 2.6.21-rc6

.. perfect? Ahh, sure.

Signed-off-by: Linus Torvalds <>
15 years ago[XFRM]: beet: fix IP option decapsulation
Patrick McHardy [Thu, 5 Apr 2007 23:03:33 +0000 (16:03 -0700)]
[XFRM]: beet: fix IP option decapsulation

Beet mode looks for the beet pseudo header after the outer IP header,
which is wrong since that is followed by the ESP header. Additionally
it needs to adjust the packet length after removing the pseudo header
and point the data pointer to the real data location.

Signed-off-by: Patrick McHardy <>
Signed-off-by: David S. Miller <>
15 years ago[XFRM]: beet: fix beet mode decapsulation
Patrick McHardy [Thu, 5 Apr 2007 22:59:41 +0000 (15:59 -0700)]
[XFRM]: beet: fix beet mode decapsulation

Beet mode decapsulation fails to properly set up the skb pointers, which
only works by accident in combination with CONFIG_NETFILTER, since in that
case the skb is fixed up in xfrm4_input before passing it to the netfilter

Signed-off-by: Patrick McHardy <>
Signed-off-by: David S. Miller <>
15 years ago[XFRM]: beet: use IPOPT_NOP for option padding
Patrick McHardy [Thu, 5 Apr 2007 22:54:39 +0000 (15:54 -0700)]
[XFRM]: beet: use IPOPT_NOP for option padding

draft-nikander-esp-beet-mode-07.txt states "The padding MUST be filled
with NOP options as defined in Internet Protocol [1] section 3.1
Internet header format.", so do that.

Signed-off-by: Patrick McHardy <>
Signed-off-by: David S. Miller <>
15 years ago[XFRM]: beet: fix IP option encapsulation
Patrick McHardy [Thu, 5 Apr 2007 22:54:02 +0000 (15:54 -0700)]
[XFRM]: beet: fix IP option encapsulation

Beet mode calculates an incorrect value for the transport header location
when IP options are present, resulting in encapsulation errors.

The correct location is 4 or 8 bytes before the end of the original IP
header, depending on whether the pseudo header is padded.

Signed-off-by: Patrick McHardy <>
Signed-off-by: David S. Miller <>
15 years agoIB/iser: Don't defer connection failure notification to workqueue
Erez Zilber [Sun, 1 Apr 2007 10:53:43 +0000 (12:53 +0200)]
IB/iser: Don't defer connection failure notification to workqueue

When a connection is terminated asynchronously from the iSCSI layer's
perspective, iSER needs to notify the iSCSI layer that the connection
has failed.  This is done using a workqueue (switched to from the iSER
tasklet context).  Meanwhile, the connection object (that holds the
work struct) is released.  If the workqueue function wasn't called
yet, it will be called later with a NULL pointer, which will crash the

The context switch (tasklet to workqueue) is not required, and
everything can be done from the iSER tasklet. This eliminates the NULL
work struct bug (and simplifies the code).

Signed-off-by: Erez Zilber <>
Signed-off-by: Roland Dreier <>
15 years agoHID: Do not discard truncated input reports
Adam Kropelin [Thu, 5 Apr 2007 14:06:30 +0000 (16:06 +0200)]
HID: Do not discard truncated input reports

Truncated reports should not be discarded since it prevents buggy
devices from communicating with userspace.

Prior to the regession introduced in 2.6.20, a shorter-than-expected
report in hid_input_report() was passed thru after having the missing
bytes cleared. This behavior was established over a few patches in the
2.6.early-teens days, including commit

This patch restores the previous behavior and fixes the regression.

Signed-off-by: Adam Kropelin <>
Signed-off-by: Jiri Kosina <>
15 years ago[IPSEC]: Reject packets within replay window but outside the bit mask
Herbert Xu [Thu, 5 Apr 2007 07:07:39 +0000 (00:07 -0700)]
[IPSEC]: Reject packets within replay window but outside the bit mask

Up until this point we've accepted replay window settings greater than
32 but our bit mask can only accomodate 32 packets.  Thus any packet
with a sequence number within the window but outside the bit mask would
be accepted.

This patch causes those packets to be rejected instead.

Signed-off-by: Herbert Xu <>
Signed-off-by: David S. Miller <>
15 years ago[IPv6]: Exclude truncated packets from InHdrErrors statistics
Mitsuru Chinen [Thu, 5 Apr 2007 06:54:59 +0000 (23:54 -0700)]
[IPv6]: Exclude truncated packets from InHdrErrors statistics

Incoming trancated packets are counted as not only InTruncatedPkts but
also InHdrErrors. They should be counted as InTruncatedPkts only.

Signed-off-by: Mitsuru Chinen <>
Acked-by: YOSHIFUJI Hideaki <>
Signed-off-by: David S. Miller <>
15 years ago[APPLETALK]: Fix a remotely triggerable crash
Jean Delvare [Thu, 5 Apr 2007 06:52:46 +0000 (23:52 -0700)]
[APPLETALK]: Fix a remotely triggerable crash

When we receive an AppleTalk frame shorter than what its header says,
we still attempt to verify its checksum, and trip on the BUG_ON() at
the end of function atalk_sum_skb() because of the length mismatch.

This has security implications because this can be triggered by simply
sending a specially crafted ethernet frame to a target victim,
effectively crashing that host. Thus this qualifies, I think, as a
remote DoS. Here is the frame I used to trigger the crash, in npg

<Appletalk Killer>
# Ethernet header -----

  XX XX XX XX XX XX  # Destination MAC
  00 00 00 00 00 00  # Source MAC
  00 1D              # Length

# LLC header -----

  AA AA 03
  08 00 07 80 9B  # Appletalk

# Appletalk header -----

  00 1B        # Packet length (invalid)
  00 01        # Fake checksum
  00 00 00 00  # Destination and source networks
  00 00 00 00  # Destination and source nodes and ports

# Payload -----

  0C 0D 0E 0F 10 11 12 13

The destination MAC address must be set to those of the victim.

The severity is mitigated by two requirements:
* The target host must have the appletalk kernel module loaded. I
  suspect this isn't so frequent.
* AppleTalk frames are non-IP, thus I guess they can only travel on
  local networks. I am no network expert though, maybe it is possible
  to somehow encapsulate AppleTalk packets over IP.

The bug has been reported back in June 2004:
But it wasn't investigated, and was closed in July 2006 as both
reporters had vanished meanwhile.

This code was new in kernel 2.6.0-test5:;a=commitdiff;h=7ab442d7e0a76402c12553ee256f756097cae2d2
And not modified since then, so we can assume that vanilla kernels
2.6.0-test5 and later, and distribution kernels based thereon, are

Note that I still do not know for sure what triggered the bug in the
real-world cases. The frame could have been corrupted by the kernel if
we have a bug hiding somewhere. But more likely, we are receiving the
faulty frame from the network.

Signed-off-by: Jean Delvare <>
Signed-off-by: David S. Miller <>
15 years ago[PATCH] ia64: desc_empty thinko/typo fix
Maciej Zenczykowski [Thu, 5 Apr 2007 02:08:27 +0000 (19:08 -0700)]
[PATCH] ia64: desc_empty thinko/typo fix

Just a one-byter for an ia64 thinko/typo - already fixed for i386 and x86_64.

Acked-by: Tony Luck <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] Fix build error on zs serial driver
Yoichi Yuasa [Thu, 5 Apr 2007 02:08:25 +0000 (19:08 -0700)]
[PATCH] Fix build error on zs serial driver

drivers/tc/zs.c:73:24: error: asm/dec/tc.h: No such file or directory

Signed-off-by: Yoichi Yuasa <>
Acked-by: Maciej W. Rozycki <>
Cc: Ralf Baechle <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] fix jiffies clocksource inittime
john stultz [Thu, 5 Apr 2007 02:08:24 +0000 (19:08 -0700)]
[PATCH] fix jiffies clocksource inittime

In debugging a problem w/ the -rt tree, I noticed that on systems that mark
the tsc as unstable before it is registered, the TSC would still be
selected and used for a short period of time.  Digging in it looks to be a
result of the mix of the clocksource list changes and my clocksource
initialization changes.

With the -rt tree, using a bad TSC, even for a short period of time can
results in a hang at boot.  I was not able to reproduce this hang w/
mainline, but I'm not completely certain that someone won't trip on it.

This patch resolves the issue by initializing the jiffies clocksource
earlier so a bad TSC won't get selected just because nothing else is yet

Signed-off-by: John Stultz <>
Acked-by: Thomas Gleixner <>
Cc: Ingo Molnar <>
Cc: Andi Kleen <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] cciss: add init of drv->cylinders back to cciss_geometry_inquiry
Mike Miller (OS Dev) [Thu, 5 Apr 2007 02:08:23 +0000 (19:08 -0700)]
[PATCH] cciss: add init of drv->cylinders back to cciss_geometry_inquiry

This patch adds initialization of drv->cylinders back into the failing case in
cciss_geometry_inquiry. I inadvertently removed it in one my 2TB updates.

Signed-off-by: Mike Miller <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] remove protection of LANANA-reserved majors
Andrew Morton [Thu, 5 Apr 2007 02:08:22 +0000 (19:08 -0700)]
[PATCH] remove protection of LANANA-reserved majors

Revert all this.  It can cause device-mapper to receive a different major from
earlier kernels and it turns out that the Amanda backup program (via GNU tar,
apparently) checks major numbers on files when performing incremental backups.

Which is a bit broken of Amanda (or tar), but this feature isn't important
enough to justify the churn.

Cc: Ingo Molnar <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] swsusp: fix memory shrinker
Rafael J. Wysocki [Thu, 5 Apr 2007 02:08:21 +0000 (19:08 -0700)]
[PATCH] swsusp: fix memory shrinker

Fix a bug in the swsusp's memory shrinker that causes some systems using
highmem to refuse to suspend to disk if image_size is set above 1/2 of
available RAM.

Special thanks to Jiri Slaby for reporting the problem and assistance in
debugging it.

Signed-off-by: Rafael J. Wysocki <>
Cc: Jiri Slaby <>
Cc: Pavel Machek <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] net/sunrpc/svcsock.c: fix a check
Adrian Bunk [Thu, 5 Apr 2007 02:08:21 +0000 (19:08 -0700)]
[PATCH] net/sunrpc/svcsock.c: fix a check

The return value of kernel_recvmsg() should be assigned to "err", not
compared with the random value of a never initialized "err" (and the "< 0"
check wrongly always returned false since == comparisons never have a
result < 0).

Spotted by the Coverity checker.

Signed-off-by: Adrian Bunk <>
Acked-by: Neil Brown <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] md: avoid a deadlock when removing a device from an md array via sysfs
NeilBrown [Thu, 5 Apr 2007 02:08:18 +0000 (19:08 -0700)]
[PATCH] md: avoid a deadlock when removing a device from an md array via sysfs

A device can be removed from an md array via e.g.
  echo remove > /sys/block/md3/md/dev-sde/state

This will try to remove the 'dev-sde' subtree which will deadlock
  commit e7b0d26a86943370c04d6833c6edba2a72a6e240

With this patch we run the kobject_del via schedule_work so as to
avoid the deadlock.

Cc: Alan Stern <>
Signed-off-by: Neil Brown <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] kernel/time.c: add missing symbol exports
Thomas Bittermann [Wed, 4 Apr 2007 20:20:54 +0000 (22:20 +0200)]
[PATCH] kernel/time.c: add missing symbol exports

This patch adds 2 missing symbol exports: jiffies_to_timeval() and
timeval_to_jiffies().  The (not yet merged) dm-raid4-5 module will need
them, and they used to be indirectly exported by virtue of being inline

Commit 8b9365d753d9870bb6451504c13570b81923228f ("[PATCH] Uninline
jiffies.h functions") uninlined them, and thus modules now need them
explicitly exported to use them.

Signed-off-by: Thomas Bittermann <>
Acked-by: Andrew Morton <>
Acked-by: Ingo Molnar <>
Acked-by: Thomas Gleixner <>
Acked-by: john stultz <>
Signed-off-by: Linus Torvalds <>
15 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Wed, 4 Apr 2007 17:11:16 +0000 (10:11 -0700)]
Merge branch 'for-linus' of git://

* 'for-linus' of git://
  [S390] cio: Fix handling of interrupt for csch().
  [S390] page_mkclean data corruption.

15 years ago[PATCH] net: Ignore sysfs network device rename bugs.
Eric W. Biederman [Tue, 3 Apr 2007 06:07:30 +0000 (00:07 -0600)]
[PATCH] net: Ignore sysfs network device rename bugs.

The generic networking code ensures that no two networking devices
have the same name, so  there is no time except when sysfs has
implementation bugs that device_rename when called from
dev_change_name will fail.

The current error handling for errors from device_rename in
dev_change_name is wrong and results in an unusable and unrecoverable
network device if device_rename is happens to return an error.

This patch removes the buggy error handling.  Which confines the mess
when device_rename hits a problem to sysfs, instead of propagating it
the rest of the network stack.  Making linux a little more robust.

Without this patch you can observe what happens when sysfs has a bug
when CONFIG_SYSFS_DEPRECATED is not set and you attempt to rename
a real network device to a name like (broken_parity_status, device,
modalias, power, resource2, subsystem_vendor, class,  driver, irq,
msi_bus, resource, subsystem, uevent, config, enable, local_cpus,
numa_node, resource0, subsystem_device, vendor)

Greg has a patch that fixes the sysfs bugs but he doesn't trust it
for a 2.6.21 timeframe.  This patch which just ignores errors should
be safe and it keeps the system from going completely wacky.

Signed-off-by: Eric W. Biederman <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] SLAB: Mention slab name when listing corrupt objects
David Howells [Mon, 2 Apr 2007 22:46:28 +0000 (23:46 +0100)]
[PATCH] SLAB: Mention slab name when listing corrupt objects

Mention the slab name when listing corrupt objects.  Although the function
that released the memory is mentioned, that is frequently ambiguous as such
functions often release several pieces of memory.

Signed-off-by: David Howells <>
Signed-off-by: Linus Torvalds <>
15 years agoMerge branch 'upstream-linus' of
Linus Torvalds [Wed, 4 Apr 2007 15:44:40 +0000 (08:44 -0700)]
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of
  libata: Limit ATAPI DMA to R/W commands only for TORiSAN DVD drives (take 3)
  libata: Limit max sector to 128 for TORiSAN DVD drives (take 3)
  libata: Clear tf before doing request sense (take 3)
  libata: reorder HSM_ST_FIRST for easier decoding (take 3)
  libata bugfix: preserve LBA bit for HDIO_DRIVE_TASK
  2.6.21 fix lba48 bug in libata fill_result_tf()

15 years ago[PATCH] libata: add NCQ blacklist entries from Silicon Image Windows driver (v2)
Robert Hancock [Tue, 3 Apr 2007 04:05:29 +0000 (22:05 -0600)]
[PATCH] libata: add NCQ blacklist entries from Silicon Image Windows driver (v2)

This adds some NCQ blacklist entries taken from the Silicon Image 3124/3132
Windows driver .inf files. There are some confirming reports of problems
with these drives under Linux (for example
so let's disable NCQ on these drives.

 [ I'm personally starting to wonder whether we shouldn't disable NCQ by
   default, and perhaps have a white-list. There seems to be a *lot* of
   drives that do this wrong..   - Linus ]

Signed-off-by: Robert Hancock <>
Acked-by: Tejun Heo <>
Signed-off-by: Linus Torvalds <>
15 years agoMerge branch 'upstream-linus' of
Linus Torvalds [Wed, 4 Apr 2007 15:36:01 +0000 (08:36 -0700)]
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of
  r8169: fix suspend/resume for down interface
  r8169: issue request_irq after the private data are completely initialized
  b44: fix IFF_ALLMULTI handling of CAM slots
  cxgb3 - Firwmare update
  cxgb3 - Tighten xgmac workaround
  cxgb3 - detect NIC only adapters
  cxgb3 - Safeguard TCAM size usage

15 years ago[S390] cio: Fix handling of interrupt for csch().
Cornelia Huck [Wed, 4 Apr 2007 12:37:11 +0000 (14:37 +0200)]
[S390] cio: Fix handling of interrupt for csch().

Wipe internal irb if the clear function bit is set before accumulating
bits from the irb in order to follow hardware behaviour.

Signed-off-by: Cornelia Huck <>
Signed-off-by: Heiko Carstens <>
Signed-off-by: Martin Schwidefsky <>
15 years ago[S390] page_mkclean data corruption.
Martin Schwidefsky [Wed, 4 Apr 2007 12:37:10 +0000 (14:37 +0200)]
[S390] page_mkclean data corruption.

The git commit c2fda5fed81eea077363b285b66eafce20dfd45a which
added the page_test_and_clear_dirty call to page_mkclean and the
git commit 7658cc289288b8ae7dd2c2224549a048431222b3 which fixes
the "nasty and subtle race in shared mmap'ed page writeback"
problem in clear_page_dirty_for_io cause data corruption on s390.

The effect of the two changes is that for every call to
clear_page_dirty_for_io a page_test_and_clear_dirty is done. If
the per page dirty bit is set set_page_dirty is called. Strangly
clear_page_dirty_for_io is called for not-uptodate pages, e.g.
over this call-chain:

 [<000000000007c0f2>] clear_page_dirty_for_io+0x12a/0x130
 [<000000000007c494>] generic_writepages+0x258/0x3e0
 [<000000000007c692>] do_writepages+0x76/0x7c
 [<00000000000c7a26>] __writeback_single_inode+0xba/0x3e4
 [<00000000000c831a>] sync_sb_inodes+0x23e/0x398
 [<00000000000c8802>] writeback_inodes+0x12e/0x140
 [<000000000007b9ee>] wb_kupdate+0xd2/0x178
 [<000000000007cca2>] pdflush+0x162/0x23c

The bad news now is that page_test_and_clear_dirty might claim
that a not-uptodate page is dirty since SetPageUptodate which
resets the per page dirty bit has not yet been called. The page
writeback that follows clobbers the data on disk.

The simplest solution to this problem is to move the call to
page_test_and_clear_dirty under the "if (page_mapped(page))".
If a file backed page is mapped it is uptodate.

Signed-off-by: Martin Schwidefsky <>
15 years agolibata: Limit ATAPI DMA to R/W commands only for TORiSAN DVD drives (take 3)
Albert Lee [Mon, 2 Apr 2007 03:39:25 +0000 (11:39 +0800)]
libata: Limit ATAPI DMA to R/W commands only for TORiSAN DVD drives (take 3)

patch 4/4:

  Limit ATAPI DMA to R/W commands only for TORiSAN DRD-N216 DVD-ROM drives

Signed-off-by: Albert Lee <>
Signed-off-by: Jeff Garzik <>
15 years agolibata: Limit max sector to 128 for TORiSAN DVD drives (take 3)
Albert Lee [Mon, 2 Apr 2007 03:34:15 +0000 (11:34 +0800)]
libata: Limit max sector to 128 for TORiSAN DVD drives (take 3)

patch 3/4:
  The TORiSAN drive locks up when max sector == 256.
  Limit max sector to 128 for the TORiSAN DRD-N216 drives.

Signed-off-by: Albert Lee <>
Signed-off-by: Jeff Garzik <>
15 years agolibata: Clear tf before doing request sense (take 3)
Albert Lee [Mon, 2 Apr 2007 03:30:46 +0000 (11:30 +0800)]
libata: Clear tf before doing request sense (take 3)

patch 2/4:
  Clear tf before doing request sense.

This fixes the AOpen 56X/AKH timeout problem.

Signed-off-by: Albert Lee <>
Signed-off-by: Jeff Garzik <>
15 years agolibata: reorder HSM_ST_FIRST for easier decoding (take 3)
Albert Lee [Mon, 2 Apr 2007 03:28:52 +0000 (11:28 +0800)]
libata: reorder HSM_ST_FIRST for easier decoding (take 3)

patch 1/4:
  Reorder HSM_ST_FIRST, such that the task state transition is easier decoded with human eyes.

Signed-off-by: Albert Lee <>
Signed-off-by: Jeff Garzik <>
15 years agolibata bugfix: preserve LBA bit for HDIO_DRIVE_TASK
Mark Lord [Fri, 30 Mar 2007 21:45:52 +0000 (17:45 -0400)]
libata bugfix: preserve LBA bit for HDIO_DRIVE_TASK

Preserve the LBA bit in the DevSel/Head register for HDIO_DRIVE_TASK.

Signed-off-by: Mark Lord <>
Signed-off-by: Jeff Garzik <>
15 years ago2.6.21 fix lba48 bug in libata fill_result_tf()
Mark Lord [Mon, 2 Apr 2007 20:20:35 +0000 (16:20 -0400)]
2.6.21 fix lba48 bug in libata fill_result_tf()

Current 2.6.21 libata does the following:

void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
        struct ata_ioports *ioaddr = &ap->ioaddr;

        tf->command = ata_check_status(ap);
        if (tf->flags & ATA_TFLAG_LBA48) {
                iowrite8(tf->ctl | ATA_HOB, ioaddr->ctl_addr);
                tf->hob_feature = ioread8(ioaddr->error_addr);
static void fill_result_tf(struct ata_queued_cmd *qc)
        struct ata_port *ap = qc->ap;

        ap->ops->tf_read(ap, &qc->result_tf);
        qc->result_tf.flags = qc->tf.flags;

Based on this, those last two statements fill_result_tf()
appear to me to be in the wrong order, in that the tf->flags
are uninitialized at the point where tf_read() is invoked.
So for lba48 commands, tf_read() won't be reading back the
full lba48 register contents..


This patch corrects fill_result_tf() so that the flags
get copied to result_tf before they are used by tf_read().

Signed-off-by: Mark Lord <>
Signed-off-by: Jeff Garzik <>
15 years agor8169: fix suspend/resume for down interface
Francois Romieu [Mon, 2 Apr 2007 21:01:11 +0000 (23:01 +0200)]
r8169: fix suspend/resume for down interface

The PM hooks are no-op if the r8169 interface is down (i.e. !IFF_UP).
However, as the chipset is enabled, the device will not work after a
suspend/resume cycle. The patch always issue the required PCI suspend
sequence and removes the module unload/reload workaround.

Signed-off-by: Arnaud Patard <>
Signed-off-by: Francois Romieu <>
Signed-off-by: Jeff Garzik <>
15 years agor8169: issue request_irq after the private data are completely initialized
Francois Romieu [Mon, 2 Apr 2007 20:59:59 +0000 (22:59 +0200)]
r8169: issue request_irq after the private data are completely initialized

The irq handler schedules a NAPI poll request unconditionally as soon as
the status register is not clean. It has been there - and wrong - for
ages but a recent timing change made it apparently easier to trigger.

Signed-off-by: Francois Romieu <>
Cc: Jay Cliburn <>
Signed-off-by: Jeff Garzik <>
15 years agob44: fix IFF_ALLMULTI handling of CAM slots
Bill Helfinstine [Sun, 1 Apr 2007 17:10:28 +0000 (13:10 -0400)]
b44: fix IFF_ALLMULTI handling of CAM slots

If you set the IFF_ALLMULTI flag on a b44 device, or if you join more than
B44_MCAST_TABLE_SIZE multicast groups, the device will stop receiving unicast
messages.  This is because the __b44_set_mac_addr call sets the zeroth CAM
entry to the MAC address of the device, and then the loop at line 1722
proceeds to overwrite it unless the value of i is set by the __b44_load_mcast
call.  However, when IFF_ALLMULTI is set, that call is bypassed, leaving i set
to zero.

Fixed by starting the loop at 1 to make it skip the CAM entry for the MAC

Signed-off-by: Bill Helfinstine <>
Signed-off-by: Jeff Garzik <>
15 years agocxgb3 - Firwmare update
Divy Le Ray [Sat, 31 Mar 2007 07:23:30 +0000 (00:23 -0700)]
cxgb3 - Firwmare update

Introduce FW micro version.
Bump up FW version to 3.3.0

Signed-off-by: Divy Le Ray <>
Signed-off-by: Jeff Garzik <>
15 years agocxgb3 - Tighten xgmac workaround
Divy Le Ray [Sat, 31 Mar 2007 07:23:24 +0000 (00:23 -0700)]
cxgb3 - Tighten xgmac workaround

Run the watchdog task when the link is up.
Flush the XGMAC Tx FIFO when the link drops.

Also remove a statistics update that should have gone
in the previous modification of xgmac.c.

Signed-off-by: Divy Le Ray <>
Signed-off-by: Jeff Garzik <>
15 years agocxgb3 - detect NIC only adapters
Divy Le Ray [Sat, 31 Mar 2007 07:23:19 +0000 (00:23 -0700)]
cxgb3 - detect NIC only adapters

Differentiate NIC only adapters from RNICs.
Initialize offload capabilities for RNICs only.

Signed-off-by: Divy Le Ray <>
Signed-off-by: Jeff Garzik <>
15 years agocxgb3 - Safeguard TCAM size usage
Divy Le Ray [Sat, 31 Mar 2007 07:23:13 +0000 (00:23 -0700)]
cxgb3 - Safeguard TCAM size usage

Ensure that the TCAM active region size is at least 16.

Signed-off-by: Divy Le Ray <>
Signed-off-by: Jeff Garzik <>
15 years ago[PATCH] msi: synchronously mask and unmask msi-x irqs.
Eric W. Biederman [Tue, 3 Apr 2007 07:41:49 +0000 (01:41 -0600)]
[PATCH] msi: synchronously mask and unmask msi-x irqs.

This is a simplified and actually more comprehensive form of a bug
fix from Mitch Williams <>.

When we mask or unmask a msi-x irqs the writes may be posted because
we are writing to memory mapped region.  This means the mask and
unmask don't happen immediately but at some unspecified time in the
future.  Which is out of sync with how the mask/unmask logic work
for ioapic irqs.

The practical result is that we get very subtle and hard to track down
irq migration bugs.

This patch performs a read flush after writes to the MSI-X table for mask
and unmask operations.  Since the SMP affinity is set while the interrupt
is masked, and since it's unmasked immediately after, no additional flushes
are required in the various affinity setting routines.

The testing by Mitch Williams on his especially problematic system should
still be valid as I have only simplified the code, not changed the

We currently have 7 drivers: cciss, mthca, cxgb3, forceth, s2io,
pcie/portdrv_core, and qla2xxx in 2.6.21 that are affected by this
problem when the hardware they driver is plugged into the right slot.

Given the difficulty of reproducing this bug and tracing it down to
anything that even remotely resembles a cause, even if people are
being affected we aren't likely to see many meaningful bug reports, and
the people who see this bug aren't likely to be able to reproduce this
bug in a timely fashion.  So it is best to get this problem fixed
as soon as we can so people don't have problems.

Then if people do have a kernel message stating "No irq for vector" we
will know it is yet another novel cause that needs a complete new

Cc: Greg KH <>
Cc: Andrew Morton <>
Signed-off-by: "Eric W. Biederman" <>
Acked-by: Mitch Williams <>
Acked-by: "Siddha, Suresh B" <>
Signed-off-by: Linus Torvalds <>
15 years agoMerge
Linus Torvalds [Mon, 2 Apr 2007 22:23:08 +0000 (15:23 -0700)]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

  [SCSI]: Fix scsi_send_eh_cmnd scatterlist handling
  [SPARC]: Add unsigned to unused bit field in a.out.h

15 years agoMerge
Linus Torvalds [Mon, 2 Apr 2007 22:22:20 +0000 (15:22 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

  [TCP]: Do receiver-side SWS avoidance for rcvbuf < MSS.
  [BNX2]: Fix nvram write logic.
  [IPv6]: Fix incorrect length check in rawv6_sendmsg()
  [NET_SCHED]: cls_basic: fix memory leak in basic_destroy
  [NET]: Change "not found" return value for rule lookup

15 years ago[SCSI]: Fix scsi_send_eh_cmnd scatterlist handling
David S. Miller [Mon, 2 Apr 2007 21:21:55 +0000 (14:21 -0700)]
[SCSI]: Fix scsi_send_eh_cmnd scatterlist handling

This fixes a regression caused by commit:


The sense buffer code in scsi_send_eh_cmnd was changed to use
alloc_page() and a scatter list, but the sense data copy was not
updated to match so what we actually get in the sense buffer is total
grabage starting with the kernel address of the struct page we got.
Basically the stack frame of scsi_send_eh_cmd() is what ends up
in the sense buffer.

Depending upon how pointers look on a given platform, you can
end up getting sr_ioctl.c errors when you mount a cdrom.  If
the CDROM gives a check condition for GPCMD_GET_CONFIGURATION issued
by drivers/cdrom/cdrom.c:cdrom_mmc_profile(), sr_ioctl will
spit out this error message in sr_do_ioctl() with the way pointers
are on sparc64:

printk(KERN_ERR "%s: CDROM (ioctl) error, command: ", cd->;
scsi_print_sense_hdr("sr", &sshdr);
err = -EIO;

This is the error Tom Callaway reported in:

Anyways, fix this by using page_address( which is OK
because we know this is low-mem due to GFP_ATOMIC.

Signed-off-by: David S. Miller <>
Acked-by: Christoph Hellwig <>
15 years ago[SPARC]: Add unsigned to unused bit field in a.out.h
Robert Reif [Wed, 28 Mar 2007 21:21:08 +0000 (14:21 -0700)]
[SPARC]: Add unsigned to unused bit field in a.out.h

Add unsigned to unused bit field in a.out.h to make sparse happy.

[ I took care of the sparc64 side as well -DaveM ]

Signed-off-by: Robert Reif <>
Signed-off-by: David S. Miller <>
15 years ago[TCP]: Do receiver-side SWS avoidance for rcvbuf < MSS.
John Heffner [Mon, 2 Apr 2007 20:56:32 +0000 (13:56 -0700)]
[TCP]: Do receiver-side SWS avoidance for rcvbuf < MSS.

Signed-off-by: John Heffner <>
Signed-off-by: David S. Miller <>
15 years agoMerge branch 'master' of ssh://
Linus Torvalds [Mon, 2 Apr 2007 20:52:10 +0000 (13:52 -0700)]
Merge branch 'master' of ssh:///linux/kernel/git/mchehab/v4l-dvb

* 'master' of ssh://
  V4L/DVB (5496): Pluto2: fix incorrect TSCR register setting
  V4L/DVB (5495): Tda10086: fix DiSEqC message length

15 years ago[BNX2]: Fix nvram write logic.
Michael Chan [Fri, 30 Mar 2007 21:53:06 +0000 (14:53 -0700)]
[BNX2]: Fix nvram write logic.

The nvram dword alignment logic was broken when writing less than 4
bytes on a non-aligned offset.  It was missing logic to round the
length to 4 bytes.

The page erase code is also moved so that it is only called when
using non-buffered flash for better code clarity.

Update version to 1.5.7.

Based on initial patch from Tony Cureington <>.

Signed-off-by: Michael Chan <>
Signed-off-by: David S. Miller <>
15 years ago[IPv6]: Fix incorrect length check in rawv6_sendmsg()
YOSHIFUJI Hideaki [Fri, 30 Mar 2007 21:45:35 +0000 (14:45 -0700)]
[IPv6]: Fix incorrect length check in rawv6_sendmsg()

In article <> (at Thu, 29 Mar 2007 14:26:44 -0700 (PDT)), David Miller <> says:

> From: Sridhar Samudrala <>
> Date: Thu, 29 Mar 2007 14:17:28 -0700
> > The check for length in rawv6_sendmsg() is incorrect.
> > As len is an unsigned int, (len < 0) will never be TRUE.
> > I think checking for IPV6_MAXPLEN(65535) is better.
> >
> > Is it possible to send ipv6 jumbo packets using raw
> > sockets? If so, we can remove this check.
> I don't see why such a limitation against jumbo would exist,
> does anyone else?
> Thanks for catching this Sridhar.  A good compiler should simply
> fail to compile "if (x < 0)" when 'x' is an unsigned type, don't
> you think :-)

Dave, we use "int" for returning value,
so we should fix this anyway, IMHO;
we should not allow len > INT_MAX.

Signed-off-by: YOSHIFUJI Hideaki <>
Acked-by: Sridhar Samudrala <>
Signed-off-by: David S. Miller <>
15 years ago[NET_SCHED]: cls_basic: fix memory leak in basic_destroy
Patrick McHardy [Fri, 30 Mar 2007 20:36:23 +0000 (13:36 -0700)]
[NET_SCHED]: cls_basic: fix memory leak in basic_destroy

tp->root is not freed on destruction.

Signed-off-by: Patrick McHardy <>
Signed-off-by: David S. Miller <>
15 years ago[NET]: Change "not found" return value for rule lookup
Steven Whitehouse [Fri, 30 Mar 2007 20:34:27 +0000 (13:34 -0700)]
[NET]: Change "not found" return value for rule lookup

This changes the "not found" error return for the lookup
function to -ESRCH so that it can be distinguished from
the case where a rule or route resulting in -ENETUNREACH
has been found during the search.

It fixes a bug where if DECnet was compiled with routing
support, but no routes were added to the routing table,
it was failing to fall back to endnode routing.

Signed-off-by: Steven Whitehouse <>
Signed-off-by: Patrick Caulfield <>
Signed-off-by: David S. Miller <>
15 years agoMerge branch 'for-linus' of git://
Linus Torvalds [Mon, 2 Apr 2007 18:41:55 +0000 (11:41 -0700)]
Merge branch 'for-linus' of git://

* 'for-linus' of git://
  [PATCH] x86: Don't probe for DDC on VBE1.2
  [PATCH] x86-64: Increase NMI watchdog probing timeout
  [PATCH] x86-64: Let oprofile reserve MSR on all CPUs
  [PATCH] x86-64: Disable local APIC timer use on AMD systems with C1E

15 years ago[PATCH] i386: fix file_read_actor() and pipe_read() for original i386 systems
Thomas Gleixner [Mon, 2 Apr 2007 12:25:31 +0000 (14:25 +0200)]
[PATCH] i386: fix file_read_actor() and pipe_read() for original i386 systems

The __copy_to_user_inatomic() calls in file_read_actor() and pipe_read()
are broken on original i386 machines, where WP-works-ok == false, as
__copy_to_user_inatomic() on such systems calls functions which might
sleep and/or contain cond_resched() calls inside of a kmap_atomic()

The original check for WP-works-ok was in access_ok(), but got moved
during the 2.5 series to fix a race vs. swap.

Return the number of bytes to copy in the case where we are in an atomic
region, so the non atomic code pathes in file_read_actor() and
pipe_read() are taken.

This could be optimized to avoid the kmap_atomicby moving the check for
WP-works-ok into fault_in_pages_writeable(), but this is more intrusive
and can be done later.

Signed-off-by: Thomas Gleixner <>
Acked-by: Ingo Molnar <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] vt: fix potential race in VT_WAITACTIVE handler
Michal Januszewski [Mon, 2 Apr 2007 06:49:51 +0000 (23:49 -0700)]
[PATCH] vt: fix potential race in VT_WAITACTIVE handler

On a multiprocessor machine the VT_WAITACTIVE ioctl call may return 0 if
fg_console has already been updated in redraw_screen() but the console
switch itself hasn't been completed.  Fix this by checking fg_console in
vt_waitactive() with the console sem held.

Signed-off-by: Michal Januszewski <>
Acked-by: Antonino Daplas <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] Fix microcode-related suspend problem
Rafael J. Wysocki [Mon, 2 Apr 2007 06:49:49 +0000 (23:49 -0700)]
[PATCH] Fix microcode-related suspend problem

Fix the regression resulting from the recent change of suspend code
ordering that causes systems based on Intel x86 CPUs using the microcode
driver to hang during the resume.

The problem occurs since the microcode driver uses request_firmware() in
its CPU hotplug notifier, which is called after tasks has been frozen and
hangs.  It can be fixed by telling the microcode driver to use the
microcode stored in memory during the resume instead of trying to load it
from disk.

Signed-off-by: Rafael J. Wysocki <>
Adrian Bunk <>
Cc: Tigran Aivazian <>
Cc: Pavel Machek <>
Cc: Maxim <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] driver core: fix built-in drivers sysfs links
Kay Sievers [Mon, 2 Apr 2007 06:49:48 +0000 (23:49 -0700)]
[PATCH] driver core: fix built-in drivers sysfs links

built-in drivers had broken sysfs links that caused bootup hangs for
certain driver unregistry sequences.

Signed-off-by: Ingo Molnar <>
Acked-by: Kay Sievers <>
Signed-off-by: Greg KH <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] rtc-cmos lockdep fix, irq updates
David Brownell [Mon, 2 Apr 2007 06:49:47 +0000 (23:49 -0700)]
[PATCH] rtc-cmos lockdep fix, irq updates

Lockdep reported cmos_suspend() and cmos_resume() calling rtc_update_irq()
with IRQs enabled; not allowed.

Also fix problems seen on some hardware, whereby false alarm IRQs could be
reported (primarily to userspace); and update two comments to match changes
in ACPI.  Those make up most of this patch, by volume.

Signed-off-by: David Brownell <>
Cc: Alessandro Zummo <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] Correctly report PnP 64bit resources
Petr Vandrovec [Mon, 2 Apr 2007 06:49:46 +0000 (23:49 -0700)]
[PATCH] Correctly report PnP 64bit resources

Change PnP resource handling code to use proper type for resource start and
length.  Fixes bogus regions reported in /proc/iomem.

I've also made some pointer constant, as they are constant...

Signed-off-by: Petr Vandrovec <>
Cc: Bjorn Helgaas <>
Cc: Adam Belay <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] revert "retries in ext4_prepare_write() violate ordering requirements"
Andrew Morton [Mon, 2 Apr 2007 06:49:44 +0000 (23:49 -0700)]
[PATCH] revert "retries in ext4_prepare_write() violate ordering requirements"

Revert b46be05004abb419e303e66e143eed9f8a6e9f3f.  Same reasoning as for ext3.

Cc: Kirill Korotaev <>
Cc: Ingo Molnar <>
Cc: Ken Chen <>
Cc: Andrey Savochkin <>
Cc: <>
Cc: Dmitriy Monakhov <>
Cc: <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] revert "retries in ext3_prepare_write() violate ordering requirements"
Andrew Morton [Mon, 2 Apr 2007 06:49:43 +0000 (23:49 -0700)]
[PATCH] revert "retries in ext3_prepare_write() violate ordering requirements"

Revert e92a4d595b464c4aae64be39ca61a9ffe9c8b278.

Dmitry points out

"When we block_prepare_write() failed while ext3_prepare_write() we jump to
 "failure" label and call ext3_prepare_failure() witch search last mapped bh
 and invoke commit_write untill it.  This is wrong!!  because some bh from
 begining to the last mapped bh may be not uptodate.  As a result we commit to
 disk not uptodate page content witch contains garbage from previous usage."


"Unexpected file size increasing."

   Call trace the same as it was in first issue but result is different.
   For example we have file with i_size is zero.  we want write two blocks ,
   but fs has only one free block.

   ->ext3_prepare_write(...from == 0, to == 2048)
     ->block_prepare_write() == -ENOSPC# we failed but allocated one block here.
       ->commit_write( from == 0, to == 1024) # after this i_size becomes 1024 :)
     if (ret == -ENOSPC && ext3_should_retry_alloc(inode->i_sb, &retries))
        goto retry;

   Finally when all retries will be spended ext3_prepare_failure return
   -ENOSPC, but i_size was increased and later block trimm procedures can't
   help here.

We don't appear to have the horsepower to fix these issues, so let's put
things back the way they were for now.

Cc: Kirill Korotaev <>
Cc: Ingo Molnar <>
Cc: Ken Chen <>
Cc: Andrey Savochkin <>
Cc: <>
Cc: Dmitriy Monakhov <>
Cc: <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] fix page leak during core dump
Brian Pomerantz [Mon, 2 Apr 2007 06:49:41 +0000 (23:49 -0700)]
[PATCH] fix page leak during core dump

When the dump cannot occur most likely because of a full file system and
the page to be written is the zero page, the call to page_cache_release()
is missed.

Signed-off-by: Brian Pomerantz <>
Cc: Hugh Dickins <>
Cc: Nick Piggin <>
Cc: David Howells <>
Cc: <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] CPUSETS: add mems to basic usage documentation
Simon Horman [Mon, 2 Apr 2007 06:49:40 +0000 (23:49 -0700)]
[PATCH] CPUSETS: add mems to basic usage documentation

It seems that there must be at least one node in mems and at least one CPU
in cpus in order to be able to assign tasks to a cpuset.  This makes sense.
 And I think it would also make sense to include a mems setting in the
basic usage section of the documentation.

I also wonder if something logged to dmsg, explaining why a write failed,
would be a good enhancement.  I ended up having rummage arround in cpuset.c
in order to work out why my configuration was failing.

Signed-off-by: Simon Horman <>
Acked-by: Paul Jackson <>
Cc: Paul Menage <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] drivers/mfd/sm501.c: fix an off-by-one
Adrian Bunk [Mon, 2 Apr 2007 06:49:38 +0000 (23:49 -0700)]
[PATCH] drivers/mfd/sm501.c: fix an off-by-one

Fix an off-by-one spotted by the Coverity checker.

Signed-off-by: Adrian Bunk <>
Cc: Ben Dooks <>
Cc: Vincent Sanders <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>
15 years ago[PATCH] uml: fix unreasonably long udelay
Paolo 'Blaisorblade' Giarrusso [Mon, 2 Apr 2007 06:49:37 +0000 (23:49 -0700)]
[PATCH] uml: fix unreasonably long udelay

Currently we have a confused udelay implementation.

* __const_udelay does not accept usecs but xloops in i386 and x86_64
* our implementation requires usecs as arg
* it gets a xloops count when called by asm/arch/delay.h

Bugs related to this (extremely long shutdown times) where reported by some
x86_64 users, especially using Device Mapper.

To hit this bug, a compile-time constant time parameter must be passed -
that's why UML seems to work most times.  Fix this with a simple udelay

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <>
Acked-by: Jeff Dike <>
Signed-off-by: Andrew Morton <>
Signed-off-by: Linus Torvalds <>