]> nv-tegra.nvidia Code Review - linux-2.6.git/log
linux-2.6.git
17 years agoMerge /spare/repo/linux-2.6/
Jeff Garzik [Fri, 23 Sep 2005 23:03:21 +0000 (19:03 -0400)]
Merge /spare/repo/linux-2.6/

17 years ago[PATCH] ppc32: Fix configuration of PCI IO space on MPC85xx platform
Kumar Gala [Thu, 22 Sep 2005 04:54:58 +0000 (23:54 -0500)]
[PATCH] ppc32: Fix configuration of PCI IO space on MPC85xx platform

For platforms that don't have PCI IO at 0 the outbound window
registers were not being properly configured.

Signed-off-by: Andrew Klossner <andrew@cesa.opbu.xerox.com>
Signed-off-by: Kumar K. Gala <kumar.gala@freescale.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] USB: Update Documentation/usb/URB.txt
Alan Stern [Thu, 22 Sep 2005 07:49:51 +0000 (00:49 -0700)]
[PATCH] USB: Update Documentation/usb/URB.txt

This patch (as564) updates Documentation/usb/URB.txt, bringing it roughly
up to the current level.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] ub: Comment out unconditional stall clear
Pete Zaitcev [Thu, 22 Sep 2005 07:49:45 +0000 (00:49 -0700)]
[PATCH] ub: Comment out unconditional stall clear

This code appears to be more trouble than it's worth, considering that
no normal users reload drivers. So, we comment it for now. It is not
removed outright for the benefit of hackers (that is, myself).

Signed-off-by: Pete Zaitcev <zaitcev@yahoo.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] USB: Add Novatel CDMA Wireless PC card IDs to airprime
David Hollis [Thu, 22 Sep 2005 07:49:39 +0000 (00:49 -0700)]
[PATCH] USB: Add Novatel CDMA Wireless PC card IDs to airprime

USB: Add device id's for Novatel Wireless CDMA wireless PC card.
     The Novatel CDMA card behaves the same as the AirPrime by providing
     a USB serial port.

Signed-off-by: David Hollis <dhollis@davehollis.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] usb/serial/option.c: Increase input buffer size
Matthias Urlichs [Thu, 22 Sep 2005 07:49:33 +0000 (00:49 -0700)]
[PATCH] usb/serial/option.c: Increase input buffer size

The card sometimes sends >2000 bytes in one single chunk. Ouch.

Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] USB: fix pegasus driver
Kevin Vigor [Thu, 22 Sep 2005 07:49:24 +0000 (00:49 -0700)]
[PATCH] USB: fix pegasus driver

Addresses some small bugs in the pegasus ethernet-over-USB driver.
Specifically, malformed long packets from the adapter could cause a kernel
panic; the interrupt interval calculation was inappropriate for high-speed
devices; the return code from read_mii_word was tested incorrectly; and
failure to unlink outstanding URBs before freeing them could lead to kernel
panics when unloading the driver.

Signed-off-by: Kevin Vigor <kevin@realmsys.com>
Cc: Petko Manolov <petkan@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] USB: sl811-hcd minor fixes
David Brownell [Thu, 22 Sep 2005 07:49:07 +0000 (00:49 -0700)]
[PATCH] USB: sl811-hcd minor fixes

Three minor sl811-hcd fixes:

 - Elminate memory leak on one (rare) disable/shutdown path.

 - For periodic transfers that don't need to be scheduled, update
   urb->start_frame to represent the transfer phase correctly.

 - Report the (single) port as removable, by default.

Since no drivers yet use start_frame or that part of the hub descriptor,
only that leak is likely to ever matter.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 drivers/usb/host/sl811-hcd.c |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

17 years ago[PATCH] USB: fix pxa2xx_udc compile warnings
Richard Purdie [Thu, 22 Sep 2005 07:48:58 +0000 (00:48 -0700)]
[PATCH] USB: fix pxa2xx_udc compile warnings

This patch fixes several types in the PXA25x udc driver and hence fixes
several compiler warnings.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] USB: ftdi_sio: allow baud rate to be changed without raising RTS and DTR
Peter Favrholdt [Thu, 22 Sep 2005 07:48:49 +0000 (00:48 -0700)]
[PATCH] USB: ftdi_sio: allow baud rate to be changed without raising RTS and DTR

I'm using a 2 port USB RS232 dongle to connect to a serial-IR cradle for
a bar code reader). Detecting the baudrate of the serial-IR involves
keeping DTR low while changing baudrate.

This works using normal 16550A serial ports as well as the FTDI driver
version 1.4.0 (Linux 2.6.8) but stopped working with the change to
"ensure RTS and DTR are raised when changing baudrate" introduced in
version 1.4.1 (Linux 2.6.9).

The attached patch fixes this, so RTS and DTR is only raised when
changing baudrate iff the previous baudrate was B0.

Signed-off-by: Peter Favrholdt <pfavr@how.dk>
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] USB: more device IDs for Option card driver
Matthias Urlichs [Thu, 22 Sep 2005 07:48:40 +0000 (00:48 -0700)]
[PATCH] USB: more device IDs for Option card driver

Added support for HUAWEI E600 and Audiovox AirCard

User reports say that these devices work without driver modification.

Signed-off-by: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] ub: fix burning cds
Pete Zaitcev [Thu, 22 Sep 2005 07:48:29 +0000 (00:48 -0700)]
[PATCH] ub: fix burning cds

This patch fixes a few problems with ub and cleans up a couple of things:

 - Bump UB_MAX_REQ_SG, this allows to burn CDs
 - Drop initialization of urb.transfer_flags,
   now that URB_UNLINK_ASYNC is gone
 - Add forgotten processing of stalls at GetMaxLUN
 - Remove a few more P3-tagged printks whose time has come
 - Correct comment about ZIP-100

Signed-off-by: Pete Zaitcev <zaitcev@yahoo.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
 drivers/block/ub.c |   53 +++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

17 years ago[PATCH] PCI Hotplug: Fix buffer overrun in rpadlpar_sysfs.c
Linda Xie [Thu, 22 Sep 2005 07:48:24 +0000 (00:48 -0700)]
[PATCH] PCI Hotplug: Fix buffer overrun in rpadlpar_sysfs.c

Signed-off-by: Linda Xie <lxie@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] fix drivers/pci/probe.c warning
Amos Waterland [Thu, 22 Sep 2005 07:48:19 +0000 (00:48 -0700)]
[PATCH] fix drivers/pci/probe.c warning

This function expects an unsigned 32-bit type as its third argument:

 static u32 pci_size(u32 base, u32 maxbase, u32 mask)

However, given these definitions:

 #define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL)
 #define PCI_ROM_ADDRESS_MASK (~0x7ffUL)

these two calls in drivers/pci/probe.c are problematic for architectures
for which a UL is not equivalent to a u32:

 sz = pci_size(l, sz, PCI_BASE_ADDRESS_MEM_MASK);
 sz = pci_size(l, sz, PCI_ROM_ADDRESS_MASK);

Hence the below compile warning when building for ARCH=ppc64:

 drivers/pci/probe.c: In function `pci_read_bases':
 /.../probe.c:168: warning: large integer implicitly truncated to unsigned type
 /.../probe.c:218: warning: large integer implicitly truncated to unsigned type

Here is a simple fix.

Signed-off-by: Amos Waterland <apw@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] PCI: convert kcalloc to kzalloc
Pekka Enberg [Thu, 22 Sep 2005 07:48:11 +0000 (00:48 -0700)]
[PATCH] PCI: convert kcalloc to kzalloc

This patch converts kcalloc(1, ...) calls to use the new kzalloc() function.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] PCI: remove unused "scratch"
Bjorn Helgaas [Thu, 22 Sep 2005 07:48:02 +0000 (00:48 -0700)]
[PATCH] PCI: remove unused "scratch"

Unused variable.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] I2C: remove me from the MAINTAINERS file for i2c
Greg Kroah-Hartman [Thu, 22 Sep 2005 07:47:46 +0000 (00:47 -0700)]
[PATCH] I2C: remove me from the MAINTAINERS file for i2c

Remove my name from the I2C maintainer, Jean is more than capable of
handling it all now.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] fix class symlinks in sysfs
Bill Nottingham [Thu, 22 Sep 2005 07:47:36 +0000 (00:47 -0700)]
[PATCH] fix class symlinks in sysfs

The class symlinks in sysfs don't properly handle changing device names.

To demonstrate, rename your network device from eth0 to eth1. Your
pci (or usb, or whatever) device will still have a 'net:eth0' link,
except now it points to /sys/class/net/eth1.

The attached patch makes sure the class symlink name changes when
the class device name changes. It isn't 100% correct, it should be
using sysfs_rename_link. Unfortunately, sysfs_rename_link doesn't exist.

Signed-off-by: Bill Nottingham <notting@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] driver core: add helper device_is_registered()
Daniel Ritz [Thu, 22 Sep 2005 07:47:24 +0000 (00:47 -0700)]
[PATCH] driver core: add helper device_is_registered()

add the helper and use it instead of open coding the klist_node_attached() check
(which is a layering violation IMHO)

idea by Alan Stern.

Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] Driver Core: fis bus rescan devices race
Daniel Ritz [Thu, 22 Sep 2005 07:47:11 +0000 (00:47 -0700)]
[PATCH] Driver Core: fis bus rescan devices race

bus_rescan_devices_helper() does not hold the dev->sem when it checks for
!dev->driver().  device_attach() holds the sem, but calls again
device_bind_driver() even when dev->driver is set.

What happens is that a first device_attach() call (module insertion time)
is on the way binding the device to a driver.  Another thread calls
bus_rescan_devices().  Now when bus_rescan_devices_helper() checks for
dev->driver it is still NULL 'cos the the prior device_attach() is not yet
finished.  But as soon as the first one releases the dev->sem the second
device_attach() tries to rebind the already bound device again.
device_bind_driver() does this blindly which leads to a corrupt
driver->klist_devices list (the device links itself, the head points to the
device).  Later a call to device_release_driver() sets dev->driver to NULL
and breaks the link it has to itself on knode_driver.  Rmmoding the driver
later calls driver_detach() which leads to an endless loop 'cos the list
head in klist_devices still points to the device.  And since dev->driver is
NULL it's stuck with the same device forever.  Boom.  And rmmod hangs.

Very easy to reproduce with new-style pcmcia and a 16bit card.  Just loop
modprobe <pcmcia-modules> ;cardctl eject; rmmod <card driver, pcmcia
modules>.

Easiest fix is to check if the device is already bound to a driver in
device_bind_driver().  This avoids the double binding.

Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] Add NVIDIA device ID in sata_nv
Andy Currid [Mon, 19 Sep 2005 13:17:52 +0000 (06:17 -0700)]
[PATCH] Add NVIDIA device ID in sata_nv

Signed-off-by: Andy Currid <acurrid@nvidia.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
17 years ago[PATCH] r8169: call proper VLAN receive function
Tommy Christensen [Wed, 21 Sep 2005 19:13:57 +0000 (12:13 -0700)]
[PATCH] r8169: call proper VLAN receive function

vlan_hwaccel_rx should be used when in interrupt context.

Fixes bug  http://bugzilla.kernel.org/show_bug.cgi?id=5284

Signed-off-by: Tommy S. Christensen <tommy.christensen@tpack.net>
Cc: Francois Romieu <romieu@fr.zoreil.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
17 years ago[PATCH] skge: check length from PHY
Stephen Hemminger [Mon, 19 Sep 2005 22:37:16 +0000 (15:37 -0700)]
[PATCH] skge: check length from PHY

Cleanup receive buffer allocation and management,
Add more error handling checks from PHY and bump version.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
17 years ago[PATCH] skge: expand ethtool debug register dump
Stephen Hemminger [Mon, 19 Sep 2005 22:37:34 +0000 (15:37 -0700)]
[PATCH] skge: expand ethtool debug register dump

Expand the returned data for ethtool debug access to include
all of the mapped PCI area; except for the small set of registers
that are for diagnostic RAM access. Access to those registers
will hang the system.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
17 years ago[PATCH] bonding: Fix link monitor capability check (was skge: set mac address oops...
nsxfreddy@gmail.com [Wed, 21 Sep 2005 19:18:04 +0000 (14:18 -0500)]
[PATCH] bonding: Fix link monitor capability check (was skge: set mac address oops with bonding)

Fix bond_enslave link monitoring warning to check use_carrier status
and ethtool_ops in addition to do_ioctl.  This version checks ethtool_ops
as well as do_ioctl, and also uses the per-bond params.use_carrier
instead of the global use_carrier.

Signed-off-by: Jason R. Martin <nsxfreddy@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
17 years ago[PATCH] uml: fix compile warning after consolidation patch
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:40:49 +0000 (18:40 +0200)]
[PATCH] uml: fix compile warning after consolidation patch

The header declaring this function wasn't included, so the function declaration
was totally bogus wrt. the proto - even if this wasn't going to fail at all.

It was so bad that the compile warning I got was "control reaches end of
non-void function", i.e. missing return. Actually, this has been there for ages,
the consolidation patch just added the warning which was needed to clean it up.
Nice. Really.

Cc: Allan Graves <allan.graves@gmail.com>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] uml: comment about cast build fix
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:40:29 +0000 (18:40 +0200)]
[PATCH] uml: comment about cast build fix

Explain why the casting we do to silence this warning is indeed safe.

It is because the field we're casting from, though being 64-bit wide, was filled
with a pointer in first place by ourselves.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] uml: readd removed unistd.h inclusion
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:40:10 +0000 (18:40 +0200)]
[PATCH] uml: readd removed unistd.h inclusion

Readd this header (deleted in 60d339f6fe0831060600c62418b71a62ad26c281). A
warning is spit out here about undeclared getpgrp().

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] uml: fix bogus HOST_ELF_CLASS symbol name
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:39:47 +0000 (18:39 +0200)]
[PATCH] uml: fix bogus HOST_ELF_CLASS symbol name

Even if with a bit of misunderstanding, Al fixed this in commit
95608261dae863bc43292e6fbd946a3abd3aa49f.

Well, the symbol was intended to come from userspace (it exists there on normal
host), but since some hosts may miss that, using the kernel one is just as fine.
However, rename it to be named consistently with the rest.

Actually, he missed converting ELFCLASS32 to coming from kernel headers. For
consistence, add ELFCLASS64 too.

Cc: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] uml: Fix conflict between libc and ipv6
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:39:32 +0000 (18:39 +0200)]
[PATCH] uml: Fix conflict between libc and ipv6

gcc is now complaining during link on some hosts - fix it as for other things.
Reported by Antoine Martin <antoine@nagafix.co.uk>.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] uml: fix uname output on 32-bit binary on 64-bit host
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:39:14 +0000 (18:39 +0200)]
[PATCH] uml: fix uname output on 32-bit binary on 64-bit host

Translate uname output taken from the host if needed.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] uml: fix modify_ldt - missing break in switch
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:38:57 +0000 (18:38 +0200)]
[PATCH] uml: fix modify_ldt - missing break in switch

I am a lamer :-(. Luckily, Luo Xin performed LTP testing and found this failure.
Btw, the fact that the patch in which I introduced this was merged shows that:

a) I'm really trusted by people
b) sometimes they're wrong about point a).
c) lack of time for reviewers.

CC: Luo Xin <luothing@sina.com>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] uml: remove verify_area_{tt,skas}
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:38:33 +0000 (18:38 +0200)]
[PATCH] uml: remove verify_area_{tt,skas}

When removing verify_area, verify_area_{tt,skas} were forgotten.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] Remove unused var from asm/futex.h
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:38:09 +0000 (18:38 +0200)]
[PATCH] Remove unused var from asm/futex.h

As recently done by Russell King for ARM, commit
4732efbeb997189d9f9b04708dc26bf8613ed721 introduces a generic asm/futex.h copied
along most arches, which includes a "-ENOSYS support" to be changed if needed.
However, it includes an unused var (taken from the "real" version) which GCC
warns about.

Remove it from all arches having that file version (i.e. same GIT id).
$ git-diff-tree -r HEAD
and
$ git-ls-tree  -r HEAD include/|grep 9feff4ce1424bc390608326240be369eb13aa648

may be more interesting than looking at the patch itself, to make sure I've
just copied the arm header to all other archs having the original dummy version
of this file.

Cc: Jakub Jelinek <jakub@redhat.com>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] uml: adapt asm/futex.h to our arch
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:37:14 +0000 (18:37 +0200)]
[PATCH] uml: adapt asm/futex.h to our arch

Follow up to 4732efbeb997189d9f9b04708dc26bf8613ed721 - uml must just reuse
as-is the backing architecture support. There is a micro-fixup is needed for the
included file, which won't affect i386 behaviour at all.

I've not tested compilation on x86_64, only on x86, but the code is almost the
same except the culprit test, so everything should be ok on x86_64 too.

Cc: Jakub Jelinek <jakub@redhat.com>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Wed, 21 Sep 2005 21:30:37 +0000 (14:30 -0700)]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

17 years ago[ARM] 2932/1: Avoid the "noreturn" warning in arch/arm/kernel/traps.c
Catalin Marinas [Wed, 21 Sep 2005 21:14:05 +0000 (22:14 +0100)]
[ARM] 2932/1: Avoid the "noreturn" warning in arch/arm/kernel/traps.c

Patch from Catalin Marinas

This patch prevents the "noreturn function does return" warning in the
__bug() function in arch/arm/kernel/traps.c

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
Linus Torvalds [Wed, 21 Sep 2005 20:21:35 +0000 (13:21 -0700)]
Merge /pub/scm/linux/kernel/git/roland/infiniband

17 years ago[IB] Fix RMPP receive length calculation
Hal Rosenstock [Wed, 21 Sep 2005 19:33:09 +0000 (12:33 -0700)]
[IB] Fix RMPP receive length calculation

Based on simplification idea from Sean Hefty <sean.hefty@intel.com>

Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
17 years ago[IB] Add MAD data field size definitions
Sean Hefty [Wed, 21 Sep 2005 19:31:26 +0000 (12:31 -0700)]
[IB] Add MAD data field size definitions

Clean up code by using enums instead of hard-coded magic numbers.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
17 years ago[PATCH] fat: fix adate
Stephane Kardas [Wed, 21 Sep 2005 16:55:45 +0000 (09:55 -0700)]
[PATCH] fat: fix adate

During a forensic analysis on the fat file system, I found than the result for
the last access date on this file system was different between the stat
command and the istat command (package tct-utils).

The istat command display a true date (the right windows date) but the stat
primitive (so stat, find, ls command) displays a wrong date.

Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] update URL for HPET spec.
Randy Dunlap [Wed, 21 Sep 2005 16:55:44 +0000 (09:55 -0700)]
[PATCH] update URL for HPET spec.

Correct URL for HPET spec.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] Adds sys_set_mempolicy() in include/linux/syscalls.h
Eric Dumazet [Wed, 21 Sep 2005 16:55:43 +0000 (09:55 -0700)]
[PATCH] Adds sys_set_mempolicy() in include/linux/syscalls.h

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] skge: add maintainer
Stephen Hemminger [Wed, 21 Sep 2005 16:55:41 +0000 (09:55 -0700)]
[PATCH] skge: add maintainer

Add MAINTAINER record for Andrew ;-)

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] fixup Documentation/DocBook/kernel-hacking.tmpl
Christoph Hellwig [Wed, 21 Sep 2005 16:55:40 +0000 (09:55 -0700)]
[PATCH] fixup Documentation/DocBook/kernel-hacking.tmpl

__FUNCTION__ is the prefered kernel idiom, __func__ is not supported by gcc
2.95 (we actually map __FUNCTION__ to __func__ for more recent compilers,
but it should never be used directly)

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] mm: add a note about partially hardcoded VM_* flags
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:55:39 +0000 (09:55 -0700)]
[PATCH] mm: add a note about partially hardcoded VM_* flags

Hugh made me note this line for permission checking in mprotect():

if ((newflags & ~(newflags >> 4)) & 0xf) {

after figuring out what's that about, I decided it's nasty enough.  Btw
Hugh itself didn't like the 0xf.

We can safely change it to VM_READ|VM_WRITE|VM_EXEC because we never change
VM_SHARED, so no need to check that.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] mm: update stale comment for removal of page->list
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:55:38 +0000 (09:55 -0700)]
[PATCH] mm: update stale comment for removal of page->list

Update comment for the 2.6.6-rc1 conversion from page->list and
address_space->{clean,dirty,locked}_pages to radix tree tagging and ->lru.

I've mostly avoided to mention page lists (at least I've shortened the
comment).

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] README update from the stone age
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:55:37 +0000 (09:55 -0700)]
[PATCH] README update from the stone age

We have no options which the user can set in the Makefile.  Only the
EXTRAVERSION, which is also useful in place of the "backup modules"
suggestion.

We don't have configuration options in the top Makefile.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] fix locking comment in unmap_region()
Paolo 'Blaisorblade' Giarrusso [Wed, 21 Sep 2005 16:55:37 +0000 (09:55 -0700)]
[PATCH] fix locking comment in unmap_region()

That comment is plain wrong (we even take the pagetable lock inside
unmap_region()).

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] Fix I2O config-osm init to return proper error
Deepak Saxena [Wed, 21 Sep 2005 16:55:35 +0000 (09:55 -0700)]
[PATCH] Fix I2O config-osm init to return proper error

We currently unregister the config-osm driver if initialization of the
legacy ioctl() handlers failed but still return success.  We should be
returning -EBUSY in this case.

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Cc: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] ppc64: Build zImage.vmode for G5
Benjamin Herrenschmidt [Wed, 21 Sep 2005 16:55:34 +0000 (09:55 -0700)]
[PATCH] ppc64: Build zImage.vmode for G5

zImage.vmode was recently added.  It's a version of zImage in which the ELF
note section used by open firmware indicates that it requires a virtual
mode instance of OF instead of real mode.  This allows it to work with
Apple OF, and thus is directly bootable (or netbootable) from OF command
line.  (Unfortunately, pSeries OF sort-of requires real mode and Apple OF
sort-of requires virtual mode, and both tend to be unhappy if no notes
section specifies the mode at all).

However, we forgot to add zImage.vmode to the default G5 build. This
fixes it.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] remove blkdev_scsi_issue_flush_fn again
Christoph Hellwig [Wed, 21 Sep 2005 16:55:33 +0000 (09:55 -0700)]
[PATCH] remove blkdev_scsi_issue_flush_fn again

This function was removed a while ago, but crept in again via a recent
scsi merge.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] ppc64: Fix issue with non zero boot cpu
Anton Blanchard [Wed, 21 Sep 2005 16:55:33 +0000 (09:55 -0700)]
[PATCH] ppc64: Fix issue with non zero boot cpu

The new version of the flattened device tree passes the boot cpuid in the
header instead of via a linux,boot-cpu property.

We need to update the in kernel OF parsing code to do this, otherwise
machines with a non zero boot cpuid fail to come up.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] cciss: busy_initializing bug fix
Mike Miller [Wed, 21 Sep 2005 16:55:32 +0000 (09:55 -0700)]
[PATCH] cciss: busy_initializing bug fix

This patch fixes the problem Bjorn reported.  The busy_initializing flag
should have cleared before going into the for loop.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] PPC64: Fix boot for some pre-POWER4 systems
Olof Johansson [Wed, 21 Sep 2005 16:55:31 +0000 (09:55 -0700)]
[PATCH] PPC64: Fix boot for some pre-POWER4 systems

Some RS64 systems (such as F80) have non-python host bridges with EADS.
However, they have two EADS with 4 buses each under them, so the old logic
that assumed no more than 7 busses per PHB failed miserably.

Big thanks to Olaf Hering for helping me test this, he's got one of the few
machines that broke from the previous logic.

Also, to be a bit smarter at detecting the need for a PHB-level IOMMU table
by checking for the presence of an ISA bus.  Only PHBs with ISA bridges
should need the PHB-level table.

Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: Anton Blanchard <anton@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] Add printk_clock()
Andrew Morton [Wed, 21 Sep 2005 16:55:30 +0000 (09:55 -0700)]
[PATCH] Add printk_clock()

ia64's sched_clock() accesses per-cpu data which isn't set up at boot time.
Hence ia64 cannot use printk timestamping, because printk() will crash in
sched_clock().

So make printk() use printk_clock(), defaulting to sched_clock(), overrideable
by the architecture via attribute(weak).

Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] Fix invisible threads problem
Sripathi Kodi [Mon, 19 Sep 2005 23:26:12 +0000 (18:26 -0500)]
[PATCH] Fix invisible threads problem

When the main thread of a thread group has done pthread_exit() and died,
the other threads are still happily running, but will not be visible
under /proc because their leader is no longer accessible.

This fixes the access control so that we can see the sub-threads again.

Signed-off-by: Sripathi Kodi <sripathik@in.ibm.com>
Acked-by: Al Viro <viro@ftp.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] ppc64: Fix PCI flags when using OF device tree
Paul Mackerras [Wed, 21 Sep 2005 04:14:22 +0000 (14:14 +1000)]
[PATCH] ppc64: Fix PCI flags when using OF device tree

My code to set up the PCI tree from the Open Firmware device tree was
setting IORESOURCE_* flags on the resources for the devices, but not
the PCI_BASE_ADDRESS_* flags.  This meant that some drivers
misbehaved, and /proc/pci showed the wrong types for the resources.
This fixes it.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Wed, 21 Sep 2005 14:53:38 +0000 (07:53 -0700)]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

17 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Wed, 21 Sep 2005 14:53:05 +0000 (07:53 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

17 years ago[SPARC] cs4231: Fix SBUS support in this driver.
Christopher Zimmermann [Wed, 21 Sep 2005 07:41:22 +0000 (00:41 -0700)]
[SPARC] cs4231: Fix SBUS support in this driver.

From: Christopher Zimmermann <madroach@zakweb.de>

This patch enables SBus support for the cs4231 sound driver.
It is tested on an Ultra2. Capture and playback both work.
I experienced lags and crashes using certain threaded
players like ogg123 and mp3blaster, while the former is
lagging far more. This behavior may be specific to SMP
systems. It is reproducable using the dummy sound card
driver. Sox works flawlessly.

Setting up the calculation of ptr in snd_cs4231_playback_pointer
was a bit strange. I got it to work by not incrementing the
[pc]_periods_sent counter when starting DMA the first time
in cs4231_dma_trigger. Therefore this dummy thing.

[ I did some minor cleanups -DaveM ]

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[ATYFB]: Fix build with CONFIG_FB_ATY_GENERIC_LCD disabled.
Tom 'spot' Callaway [Wed, 21 Sep 2005 07:29:16 +0000 (00:29 -0700)]
[ATYFB]: Fix build with CONFIG_FB_ATY_GENERIC_LCD disabled.

Signed-off-by: Tom 'spot' Callaway <tcallawa@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[TCP]: Set default congestion control correctly for incoming connections.
Stephen Hemminger [Wed, 21 Sep 2005 07:19:46 +0000 (00:19 -0700)]
[TCP]: Set default congestion control correctly for incoming connections.

Patch from Joel Sing to fix the default congestion control algorithm
for incoming connections. If a new congestion control handler is added
(via module), it should become the default for new
connections. Instead, the incoming connections use reno. The cause is
incorrect initialisation causes the tcp_init_congestion_control()
function to return after the initial if test fails.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Acked-by: Ian McDonald <imcdnzl@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[FIB_TRIE]: message cleanup
Stephen Hemminger [Wed, 21 Sep 2005 07:15:39 +0000 (00:15 -0700)]
[FIB_TRIE]: message cleanup

Cleanup the printk's in fib_trie:
* Convert a couple of places in the dump code to BUG_ON
* Put log level's on each message
The version message really needed the message since it leaks out
on the pretty Fedora bootup.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Acked-by: Robert Olsson <Robert.Olsson@data.slu.se>,
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[AF_PACKET]: Allow for > 8 byte hardware addresses.
Eric W. Biederman [Wed, 21 Sep 2005 07:11:37 +0000 (00:11 -0700)]
[AF_PACKET]: Allow for > 8 byte hardware addresses.

The convention is that longer addresses will simply extend
the hardeware address byte arrays at the end of sockaddr_ll and
packet_mreq.

In making this change a small information leak was also closed.
The code only initializes the hardware address bytes that are
used, but all of struct sockaddr_ll was copied to userspace.
Now we just copy sockaddr_ll to the last byte of the hardware
address used.

For error checking larger structures than our internal
maximums continue to be allowed but an error is signaled if we can
not fit the hardware address into our internal structure.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
Linus Torvalds [Wed, 21 Sep 2005 00:38:51 +0000 (17:38 -0700)]
Merge /pub/scm/linux/kernel/git/roland/infiniband

17 years ago[PATCH] fbdev: Fix reversed back and front porches
Antonino A. Daplas [Tue, 20 Sep 2005 23:32:49 +0000 (07:32 +0800)]
[PATCH] fbdev: Fix reversed back and front porches

In fbdev perspective, the frontporch is the lower/right margin and the
backporch is the upper/left margin.

Correct.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[PATCH] nvidiafb: Fix absence of cursor in nvidiafb
Antonino A. Daplas [Tue, 20 Sep 2005 23:30:21 +0000 (07:30 +0800)]
[PATCH] nvidiafb: Fix absence of cursor in nvidiafb

A recent change in nvidiafb caused nvidiafb_cursor to always return -ENXIO
instead of using the soft_cursor.  This will happen if the parameter "hwcur"
is not set, which happens to be the default.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[ARM] Fix pcf8583 to build
Russell King [Tue, 20 Sep 2005 20:01:13 +0000 (21:01 +0100)]
[ARM] Fix pcf8583 to build

Seems that the Acorn RTC driver missed an update.  Fix it.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years ago[SPARC64]: Verify vmalloc TLB misses more strictly.
David S. Miller [Tue, 20 Sep 2005 19:18:38 +0000 (12:18 -0700)]
[SPARC64]: Verify vmalloc TLB misses more strictly.

Arrange the modules, OBP, and vmalloc areas such that a range
verification can be done quite minimally.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[PATCH] IB/mthca: Fix device removal memory leak
Michael S. Tsirkin [Tue, 20 Sep 2005 17:54:48 +0000 (10:54 -0700)]
[PATCH] IB/mthca: Fix device removal memory leak

Clean up QP table array on device removal.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
17 years ago[PATCH] IPoIB: Don't flush workqueue from within workqueue
Roland Dreier [Tue, 20 Sep 2005 17:52:04 +0000 (10:52 -0700)]
[PATCH] IPoIB: Don't flush workqueue from within workqueue

ipoib_mcast_restart_task() is always called from within the
single-threaded IPoIB workqueue, so flushing the workqueue from within
the function can lead to a recursion overflow.  But since we're
running in a single-threaded workqueue, we're already synchronized
against other items in the workqueue, so just get rid of the flush in
ipoib_mcast_restart_task().

Signed-off-by: Roland Dreier <rolandd@cisco.com>
17 years ago[ARM] Prevent deadlock in page fault handler
Russell King [Tue, 20 Sep 2005 16:52:13 +0000 (17:52 +0100)]
[ARM] Prevent deadlock in page fault handler

As per x86, we may deadlock while trying to get the mmap semaphore.
Implement the same fix, which allows (eg) recursive faults to cause
an oops instead of deadlocking.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years ago[ARM] 2928/1: S3C2410 - make machine init code static
Ben Dooks [Tue, 20 Sep 2005 16:24:33 +0000 (17:24 +0100)]
[ARM] 2928/1: S3C2410 - make machine init code static

Patch from Ben Dooks

This code is not being exported, declare it static

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
Linus Torvalds [Tue, 20 Sep 2005 15:54:33 +0000 (08:54 -0700)]
Merge /pub/scm/linux/kernel/git/aia21/ntfs-2.6

17 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Linus Torvalds [Tue, 20 Sep 2005 15:50:49 +0000 (08:50 -0700)]
Merge /linux/kernel/git/jejb/scsi-for-linus-2.6

17 years ago[ARM] 2927/1: .arch.info - postfix section with .init for `make buildcheck`
Ben Dooks [Tue, 20 Sep 2005 15:45:20 +0000 (16:45 +0100)]
[ARM] 2927/1: .arch.info - postfix section with .init for `make buildcheck`

Patch from Ben Dooks

The `make buildcheck` is erroneously reporting that the .arch.info
list is referencing items in the .init section as it is not itself
postfixed with .init

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years ago[ARM] 2926/1: .proc.info - postfix section with .init for `make buildcheck`
Ben Dooks [Tue, 20 Sep 2005 15:35:03 +0000 (16:35 +0100)]
[ARM] 2926/1: .proc.info - postfix section with .init for `make buildcheck`

Patch from Ben Dooks

The `make buildcheck` is erroneously reporting that the .proc.info
list is referencing items in the .init section as it is not itself
postfixed with .init

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years ago[ARM] 2925/3: earlyparam - postfix section with .init for `make buildcheck`
Ben Dooks [Tue, 20 Sep 2005 15:25:12 +0000 (16:25 +0100)]
[ARM] 2925/3: earlyparam - postfix section with .init for `make buildcheck`

Patch from Ben Dooks

The `make buildcheck` is erroneously reporting that the earlyparam
list is referencing items in the .init section as it is not itself
postfixed with .init
Also, as per rmk's suggestion, rename the __early_param to
.early_param to bring it into line with everything else

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years ago[ARM] 2922/1: compile fix for shark
Vincent Sanders [Tue, 20 Sep 2005 15:21:42 +0000 (16:21 +0100)]
[ARM] 2922/1: compile fix for shark

Patch from Vincent Sanders

Shark platform fails to build with gcc 4 because of a bad lvalue assignement

Signed-off-by: Vincent Sanders <vince@arm.linux.org.uk>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years ago[ARM] 2924/3: taglist - postfix section with .init for `make buildcheck`
Ben Dooks [Tue, 20 Sep 2005 15:20:49 +0000 (16:20 +0100)]
[ARM] 2924/3: taglist - postfix section with .init for `make buildcheck`

Patch from Ben Dooks

The `make buildcheck` is erroneously reporting that the taglist
is referencing items in the .init section as it is not itself
postfixed with .init

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 years agoNTFS: More runlist handling fixes from Richard Russon and myself.
Anton Altaparmakov [Tue, 20 Sep 2005 13:19:30 +0000 (14:19 +0100)]
NTFS: More runlist handling fixes from Richard Russon and myself.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
17 years ago[SPARC64]: Move DCACHE_ALIASING_POSSIBLE define to asm/page.h
David S. Miller [Tue, 20 Sep 2005 03:11:57 +0000 (20:11 -0700)]
[SPARC64]: Move DCACHE_ALIASING_POSSIBLE define to asm/page.h

This showed that arch/sparc64/kernel/ptrace.c was not getting
the define properly, and thus the code protected by this ifdef
was never actually compiled before.  So fix that too.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agoLinux v2.6.14-rc2
Linus Torvalds [Tue, 20 Sep 2005 03:00:41 +0000 (20:00 -0700)]
Linux v2.6.14-rc2

Avast, ye scurvy land-lubbers! Time to try out a new release.

Arrr!

17 years ago[BYTEORDER]: Document alignment and byteorder macros
Ed L. Cashin [Tue, 20 Sep 2005 02:57:36 +0000 (19:57 -0700)]
[BYTEORDER]: Document alignment and byteorder macros

This patch comments the fact that although passing le64_to_cpup et
al. is within the intended use of the byteorder macros, using
get_unaligned is the recommended way to go.

Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[SPARC64]: Handle little-endian unaligned loads/stores correctly.
David S. Miller [Tue, 20 Sep 2005 02:56:06 +0000 (19:56 -0700)]
[SPARC64]: Handle little-endian unaligned loads/stores correctly.

Because we use byte loads/stores to cons up the value
in and out of registers, we can't expect the ASI endianness
setting to take care of this for us.  So do it by hand.

This case is triggered by drivers/block/aoe/aoecmd.c in the
ataid_complete() function where it goes:

/* word 100: number lba48 sectors */
ssize = le64_to_cpup((__le64 *) &id[100<<1]);

This &id[100<<1] address is 4 byte, rather than 8 byte aligned,
thus triggering the unaligned exception.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agoMake fsnotify possibly work better for the inode removal case
Linus Torvalds [Tue, 20 Sep 2005 02:54:29 +0000 (19:54 -0700)]
Make fsnotify possibly work better for the inode removal case

Checking i_nlink is dubious, but the alternatives look even
less appetizing.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Tue, 20 Sep 2005 01:46:11 +0000 (18:46 -0700)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

17 years ago[PATCH] raw_sendmsg DoS on 2.6
Mark J Cox [Tue, 20 Sep 2005 00:55:30 +0000 (17:55 -0700)]
[PATCH] raw_sendmsg DoS on 2.6

Fix unchecked __get_user that could be tricked into generating a
memory read on an arbitrary address.  The result of the read is not
returned directly but you may be able to divine some information about
it, or use the read to cause a crash on some architectures by reading
hardware state.  CAN-2004-2492.

Fix from Al Viro, ack from Dave Miller.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
17 years ago[TCP]: Handle SACK'd packets properly in tcp_fragment().
Herbert Xu [Tue, 20 Sep 2005 01:18:38 +0000 (18:18 -0700)]
[TCP]: Handle SACK'd packets properly in tcp_fragment().

The problem is that we're now calling tcp_fragment() in a context
where the packets might be marked as SACKED_ACKED or SACKED_RETRANS.
This was not possible before as you never retransmitted packets that
are so marked.

Because of this, we need to adjust sacked_out and retrans_out in
tcp_fragment().  This is exactly what the following patch does.

We also need to preserve the SACKED_ACKED/SACKED_RETRANS marking
if they exist.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[8021Q]: Add endian annotations.
Alexey Dobriyan [Mon, 19 Sep 2005 22:41:28 +0000 (15:41 -0700)]
[8021Q]: Add endian annotations.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[WAN] hdlc_cisco: Fix regression introduced by skb->tail changes.
Krzysztof Halasa [Mon, 19 Sep 2005 22:39:32 +0000 (15:39 -0700)]
[WAN] hdlc_cisco: Fix regression introduced by skb->tail changes.

The following commit breaks cisco mode with my WAN drivers:
author David S. Miller <davem@davemloft.net>
Tue, 28 Jun 2005 22:25:31 +0000 (15:25 -0700)
commit 689be43945e9ca7dd704522e55af1b8a73a994d3

"[NET]: Remove gratuitous use of skb->tail in network drivers."

The following patch fixes it - please apply (cisco_hard_header does
skb_push(4 bytes)).

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[NETFILTER]: Export ip_nat_port_{nfattr_to_range,range_to_nfattr}
Harald Welte [Mon, 19 Sep 2005 22:35:57 +0000 (15:35 -0700)]
[NETFILTER]: Export ip_nat_port_{nfattr_to_range,range_to_nfattr}

Those exports are needed by the PPTP helper following in the next
couple of changes.

Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[NETFILTER]: Rename misnamed function
Patrick McHardy [Mon, 19 Sep 2005 22:35:31 +0000 (15:35 -0700)]
[NETFILTER]: Rename misnamed function

Both __ip_conntrack_expect_find and ip_conntrack_expect_find_get take
a reference to the expectation, the difference is that callers of
__ip_conntrack_expect_find must hold ip_conntrack_lock.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[NETFILTER] ip6tables: remove duplicate code
Yasuyuki Kozakai [Mon, 19 Sep 2005 22:34:40 +0000 (15:34 -0700)]
[NETFILTER] ip6tables: remove duplicate code

Some IPv6 matches have very similar loops to find IPv6 extension header
and we can unify them. This patch introduces ipv6_find_hdr() to do it.
I just checked that it can find the target headers in the packet which has
dst,hbh,rt,frag,ah,esp headers.

Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[NETFILTER]: Add new PPTP conntrack and NAT helper
Harald Welte [Mon, 19 Sep 2005 22:33:08 +0000 (15:33 -0700)]
[NETFILTER]: Add new PPTP conntrack and NAT helper

This new "version 3" PPTP conntrack/nat helper is finally ready for
mainline inclusion.  Special thanks to lots of last-minute bugfixing
by Patric McHardy.

Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[IPV4]: fib_trie RCU refinements
Robert Olsson [Mon, 19 Sep 2005 22:31:18 +0000 (15:31 -0700)]
[IPV4]: fib_trie RCU refinements

* This patch is from Paul McKenney's RCU reviewing.

Signed-off-by: Robert Olsson <robert.olsson@its.uu.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[IPV4]: fib_trie tnode stats refinements
Robert Olsson [Mon, 19 Sep 2005 22:29:52 +0000 (15:29 -0700)]
[IPV4]: fib_trie tnode stats refinements

* Prints the route tnode and set the stats level deepth as before.

Signed-off-by: Robert Olsson <robert.olsson@its.uu.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[PATCH] IB: Fix data length for RMPP SA sends
Hal Rosenstock [Mon, 19 Sep 2005 20:51:01 +0000 (13:51 -0700)]
[PATCH] IB: Fix data length for RMPP SA sends

We need to subtract off the header length from our payload
length when sending multi-packet SA messages.

Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
17 years ago[SCSI] zfcp: add additional fc_host attributes
Andreas Herrmann [Mon, 19 Sep 2005 14:56:17 +0000 (16:56 +0200)]
[SCSI] zfcp: add additional fc_host attributes

this patch adds some fc host attributes and removes its equivalents
from the zfcp_adapter structure and zfcp specific sysfs subtree.

Furthermore it removes superfluous calls to fc_remort_port_delete when
an adapter is set offline because rports will be removed by
fc_remove_host anyway.

Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>