]> err.no Git - linux-2.6/log
linux-2.6
18 years ago[PATCH] PCI: Run PCI driver initialization on local node
Andi Kleen [Wed, 6 Jul 2005 17:56:03 +0000 (19:56 +0200)]
[PATCH] PCI: Run PCI driver initialization on local node

Run PCI driver initialization on local node

Instead of adding messy kmalloc_node()s everywhere run the
PCI driver probe on the node local to the device.

This would not have helped for IDE, but should for
other more clean drivers that do more initialization in probe().
It won't help for drivers that do most of the work
on first open (like many network drivers)

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] PCI Hotplug: rpaphp: Purify hotplug
John Rose [Mon, 25 Jul 2005 15:17:03 +0000 (10:17 -0500)]
[PATCH] PCI Hotplug: rpaphp: Purify hotplug

Currently rpaphp registers the following bus types as hotplug slots:
1) Actual PCI Hotplug slots
2) Embedded/Internal PCI slots
3) PCI Host Bridges

The second and third bus types are not actually direct parents of
removable adapters.  As such, the rpaphp has special case code to fake
results for attributes like power, adapter status, etc.  This patch
removes types 2 and 3 from the rpaphp module.

This patch also changes the DLPAR module so that slots can be
DLPAR-added/removed without having been designated as hotplug-capable.

Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] PCI Hotplug: rpaphp: Export slot enable
John Rose [Mon, 25 Jul 2005 15:16:58 +0000 (10:16 -0500)]
[PATCH] PCI Hotplug: rpaphp: Export slot enable

This patch exports rpaphp_config_pci_adapter() for use by the rpadlpar
module.  It also changes this function by removing any dependencies on
struct slot.  The patch also changes the RPA DLPAR-add path to enable
newly-added slots in a separate step from that which registers them as
hotplug slots.

Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] PCI Hotplug: rpaphp: Remove rpaphp_find_pci
John Rose [Mon, 25 Jul 2005 15:16:53 +0000 (10:16 -0500)]
[PATCH] PCI Hotplug: rpaphp: Remove rpaphp_find_pci

The rpaphp module currently uses a fragile method to find a pci device
by its device node.  This function is unnecessary, so this patch scraps
it.

Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] PCI Hotplug: rpaphp: Change slot pci reference
John Rose [Mon, 25 Jul 2005 16:13:38 +0000 (11:13 -0500)]
[PATCH] PCI Hotplug: rpaphp: Change slot pci reference

The slot structure in the rpaphp module currently references the PCI
contents of the slot using the PCI device of the parent bridge.  This
is unnecessary, since the module is actually interested in the
subordinate bus of the bridge.  The dependency on a PCI bridge device
also prohibits the module from registering hotplug slots that have a
root bridge as a parent, since root bridges on PPC64 don't have PCI
devices.

This patch changes struct slot to reference the PCI subsystem using a
pci_bus rather than a pci_dev.

Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] PCI Hotplug: rpaphp: Move VIO registration
John Rose [Mon, 25 Jul 2005 15:16:42 +0000 (10:16 -0500)]
[PATCH] PCI Hotplug: rpaphp: Move VIO registration

Currently, rpaphp registers Virtual I/O slots as hotplug slots.  The
only purpose of this registration is to ensure that the VIO subsystem
is notified of new VIO buses during DLPAR adds.  Similarly, rpaphp
notifies the VIO subsystem when a VIO bus is DLPAR-removed.  The rpaphp
module has special case code to fake results for attributes like power,
adapter status, etc.

The VIO register/unregister functions could just as easily be made from
the DLPAR module.  This patch moves the VIO registration calls to the
DLPAR module, and removes the VIO fluff from rpaphp altogether.

Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] PCI Hotplug: rpaphp: Remove unused stuff
John Rose [Mon, 25 Jul 2005 15:16:37 +0000 (10:16 -0500)]
[PATCH] PCI Hotplug: rpaphp: Remove unused stuff

Subject line says it all :)

Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[MMC] Add mmc_detect_change() delay support for PXAMCI driver
Richard Purdie [Thu, 8 Sep 2005 21:48:16 +0000 (22:48 +0100)]
[MMC] Add mmc_detect_change() delay support for PXAMCI driver

Allow PXA platforms to pass an appropriate delay value to the
PXA MCI driver for delaying detection changes.

Signed-Off-By: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years agoFix up ARM serial driver compile failure
Linus Torvalds [Thu, 8 Sep 2005 21:47:12 +0000 (14:47 -0700)]
Fix up ARM serial driver compile failure

Proud member of Uglyhacks'R'US.

Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Russell King <rmk+lkml@arm.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[MMC] Ensure correct mmc_priv() behaviour
Russell King [Thu, 8 Sep 2005 21:46:00 +0000 (22:46 +0100)]
[MMC] Ensure correct mmc_priv() behaviour

mmc_priv() has some nasty effects if the wrong pointer type is
passed to it.  Introduce type checking, which also means we get
the right type.  Also add an additional member to mmc_host which
is used to align host-private data appropriately.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[PATCH] w1_ds2433: Added crc16 protection and read caching.
Evgeniy Polyakov [Wed, 17 Aug 2005 11:24:37 +0000 (15:24 +0400)]
[PATCH] w1_ds2433: Added crc16 protection and read caching.

The changes to ds2433 to add CRC16 protection and read caching.

Signed-off-by: Ben Gardner <bgardner@wabtec.com>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] w1: added private family data into w1_slave strucutre.
Evgeniy Polyakov [Wed, 17 Aug 2005 11:19:08 +0000 (15:19 +0400)]
[PATCH] w1: added private family data into w1_slave strucutre.

Add family_data to struct w1_slave.

Signed-off-by: Ben Gardner <bgardner@wabtec.com>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] lib/crc16: added crc16 algorithm.
Evgeniy Polyakov [Wed, 17 Aug 2005 11:17:26 +0000 (15:17 +0400)]
[PATCH] lib/crc16: added crc16 algorithm.

Add the crc16 routines, as used by w1 devices.

Signed-off-by: Ben Gardner <bgardner@wabtec.com>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] w1: Added DS2433 driver - family id update.
Evgeniy Polyakov [Thu, 11 Aug 2005 13:27:50 +0000 (17:27 +0400)]
[PATCH] w1: Added DS2433 driver - family id update.

Work by Ben Gardner <bgardner@wabtec.com>.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] w1: Added DS2433 driver.
Evgeniy Polyakov [Thu, 11 Aug 2005 13:27:50 +0000 (17:27 +0400)]
[PATCH] w1: Added DS2433 driver.

Work by Ben Gardner <bgardner@wabtec.com>.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] w1: Decreased debug level.
Evgeniy Polyakov [Thu, 11 Aug 2005 13:27:50 +0000 (17:27 +0400)]
[PATCH] w1: Decreased debug level.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] w1: Detouching bug fixed.
Evgeniy Polyakov [Thu, 11 Aug 2005 13:27:50 +0000 (17:27 +0400)]
[PATCH] w1: Detouching bug fixed.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] w1: Added add/remove slave callbacks.
Evgeniy Polyakov [Thu, 11 Aug 2005 13:27:50 +0000 (17:27 +0400)]
[PATCH] w1: Added add/remove slave callbacks.

Patch is based on work from Ben Gardner <bgardner@wabtec.com>

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] w1: Added w1_reset_select_slave() - Resets the bus and then selects the slave by
Evgeniy Polyakov [Thu, 11 Aug 2005 13:27:49 +0000 (17:27 +0400)]
[PATCH] w1: Added w1_reset_select_slave() - Resets the bus and then selects the slave by

sending either a skip rom or a rom match.

Patch from Ben Gardner <bgardner@wabtec.com>

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] w1: Added inline functions on top of container_of().
Evgeniy Polyakov [Thu, 11 Aug 2005 13:27:49 +0000 (17:27 +0400)]
[PATCH] w1: Added inline functions on top of container_of().

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] w1: Fixed 64bit compilation warning.
Evgeniy Polyakov [Thu, 11 Aug 2005 09:45:54 +0000 (13:45 +0400)]
[PATCH] w1: Fixed 64bit compilation warning.

Fixed 64bit compilation warning.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] w1: hotplug support.
Evgeniy Polyakov [Thu, 11 Aug 2005 09:20:07 +0000 (13:20 +0400)]
[PATCH] w1: hotplug support.

Here is W1 hotplug in addition to netlink notifications.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] W1: Sync with w1/ds9490 tree.
Evgeniy Polyakov [Wed, 3 Aug 2005 11:14:50 +0000 (15:14 +0400)]
[PATCH] W1: Sync with w1/ds9490 tree.

Whitespace, static/nonstatic cleanups.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[PATCH] W1: w1_netlink: New init/fini netlink callbacks.
Evgeniy Polyakov [Wed, 27 Jul 2005 09:10:11 +0000 (13:10 +0400)]
[PATCH] W1: w1_netlink: New init/fini netlink callbacks.

They are guarded with NETLINK_DISABLE compile time options,
so if CONFIG_NET is disabled, no linking errors occur.
Bug noticed by Adrian Bunk <bunk@stusta.de>.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
18 years ago[SPARC64]: Inline membar()'s again.
David S. Miller [Thu, 8 Sep 2005 21:37:53 +0000 (14:37 -0700)]
[SPARC64]: Inline membar()'s again.

Since GCC has to emit a call and a delay slot to the
out-of-line "membar" routines in arch/sparc64/lib/mb.S
it is much better to just do the necessary predicted
branch inline instead as:

ba,pt %xcc, 1f
 membar #whatever
1:

instead of the current:

call membar_foo
 dslot

because this way GCC is not required to allocate a stack
frame if the function can be a leaf function.

This also makes this bug fix easier to backport to 2.4.x

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[IPV6]: Don't redo xfrm_lookup for cached dst entries
Patrick McHardy [Thu, 8 Sep 2005 21:27:47 +0000 (14:27 -0700)]
[IPV6]: Don't redo xfrm_lookup for cached dst entries

The xfrm lookup is already done when the dst entry is looked up first and
stored in the cache.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[IA64] Manual merge fix for 3 files
Tony Luck [Thu, 8 Sep 2005 21:27:13 +0000 (14:27 -0700)]
[IA64] Manual merge fix for 3 files

arch/ia64/Kconfig
arch/ia64/kernel/acpi.c
include/asm-ia64/irq.h

Signed-off-by: Tony Luck <tony.luck@intel.com>
18 years agoNTFS: Improve scalability by changing the driver global spin lock in
Anton Altaparmakov [Thu, 8 Sep 2005 21:13:02 +0000 (22:13 +0100)]
NTFS: Improve scalability by changing the driver global spin lock in
      fs/ntfs/aops.c::ntfs_end_buffer_async_read() to a bit spin lock
      in the first buffer head of a page.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years agoNTFS: Fix page_has_buffers()/page_buffers() handling in fs/ntfs/aops.c.
Anton Altaparmakov [Thu, 8 Sep 2005 21:08:11 +0000 (22:08 +0100)]
NTFS: Fix page_has_buffers()/page_buffers() handling in fs/ntfs/aops.c.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years agoNTFS: Fixup handling of sparse, compressed, and encrypted attributes in
Anton Altaparmakov [Thu, 8 Sep 2005 21:04:20 +0000 (22:04 +0100)]
NTFS: Fixup handling of sparse, compressed, and encrypted attributes in
      fs/ntfs/aops.c::ntfs_readpage().

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years agoNTFS: Fix fs/ntfs/aops.c::ntfs_{read,write}_block() to handle the case
Anton Altaparmakov [Thu, 8 Sep 2005 21:00:33 +0000 (22:00 +0100)]
NTFS: Fix fs/ntfs/aops.c::ntfs_{read,write}_block() to handle the case
      where a concurrent truncate has truncated the runlist under our feet.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years ago[IA64] Increase max physical address for SN platforms
Jack Steiner [Thu, 8 Sep 2005 20:28:28 +0000 (15:28 -0500)]
[IA64] Increase max physical address for SN platforms

Increase the value for the maximum physical address on SN systems.

Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
18 years ago[IA64] ensure XPC and XPNET are loaded on sn2 platforms only
Dean Nelson [Thu, 8 Sep 2005 15:46:58 +0000 (10:46 -0500)]
[IA64] ensure XPC and XPNET are loaded on sn2 platforms only

These are SN2 only drivers.  They should have platform checks to prevent
them from doing evil stuff in GENERIC kernels.

Signed-off-by: Martin Hicks <mort@sgi.com>
Acked-by: Dean Nelson <dcn@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
18 years agoMerge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Linus Torvalds [Thu, 8 Sep 2005 20:52:24 +0000 (13:52 -0700)]
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

18 years ago[IA64] defconfig: turn off QLOGIC_FC
Martin Hicks [Thu, 8 Sep 2005 15:28:11 +0000 (11:28 -0400)]
[IA64] defconfig: turn off QLOGIC_FC

Turn off the QLOGIC_FC driver.  Supposedly qla2xxx should support
these devices.  Do any ia64 machines have one of these devices as
the boot device?

Signed-off-by: Martin Hicks <mort@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
18 years agoKconfig: IEEE80211 should not depend on NET_RADIO
Jeff Garzik [Thu, 8 Sep 2005 20:44:33 +0000 (16:44 -0400)]
Kconfig: IEEE80211 should not depend on NET_RADIO

We should not restrict use of ieee80211 to only when wireless drivers
are enabled.  In-development and out-of-tree drivers may wish to use it,
and by removing this restriction we eliminate a circular dependency.

18 years agoNTFS: Optimize fs/ntfs/aops.c::ntfs_write_block() by extending the page
Anton Altaparmakov [Thu, 8 Sep 2005 20:43:47 +0000 (21:43 +0100)]
NTFS: Optimize fs/ntfs/aops.c::ntfs_write_block() by extending the page
      lock protection over the buffer submission for i/o which allows the
      removal of the get_bh()/put_bh() pairs for each buffer.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years ago[AX.25]: Make asc2ax() thread-proof
Ralf Baechle [Thu, 8 Sep 2005 20:40:41 +0000 (13:40 -0700)]
[AX.25]: Make asc2ax() thread-proof

Asc2ax was still using a static buffer for all invocations which isn't
exactly SMP-safe.  Change asc2ax to take an additional result buffer as
the argument.  Change all callers to provide such a buffer.

This one only really is a fix for ROSE and as per recent discussions
there's still much more to fix in ROSE ...

Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agoNTFS: Fixup handling of sparse, compressed, and encrypted attributes in
Anton Altaparmakov [Thu, 8 Sep 2005 20:38:05 +0000 (21:38 +0100)]
NTFS: Fixup handling of sparse, compressed, and encrypted attributes in
      fs/ntfs/aops.c::ntfs_writepage().

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years ago[NETFILTER]: ip_conntrack_netbios_ns.c gcc-2.95.x build fix
Andrew Morton [Thu, 8 Sep 2005 20:36:34 +0000 (13:36 -0700)]
[NETFILTER]: ip_conntrack_netbios_ns.c gcc-2.95.x build fix

gcc-2.95.x can't do this sort of initialisation

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[IPV4]: Fix refcount damaging in net/ipv4/route.c
Julian Anastasov [Thu, 8 Sep 2005 20:34:47 +0000 (13:34 -0700)]
[IPV4]: Fix refcount damaging in net/ipv4/route.c

One such place that can damage the dst refcnts is route.c with
CONFIG_IP_ROUTE_MULTIPATH_CACHED enabled, i don't see the user's
.config. In this new code i see that rt_intern_hash is called before
dst->refcnt is set to 1, dst is the 2nd arg to rt_intern_hash.

Arg 2 of rt_intern_hash must come with refcnt 1 as it is added to
table or dropped depending on error/add/update. One such example is
ip_mkroute_input where __mkroute_input return rth with refcnt 0 which
is provided to rt_intern_hash. ip_mkroute_output looks like a 2nd such
place. Appending untested patch for comments and review.  The idea is
to put previous reference as we are going to return next result/error.

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agoNTFS: Make ntfs_write_block() not instantiate sparse blocks if they are zero.
Anton Altaparmakov [Thu, 8 Sep 2005 20:25:48 +0000 (21:25 +0100)]
NTFS: Make ntfs_write_block() not instantiate sparse blocks if they are zero.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years agoNTFS: Fixup handling of sparse, compressed, and encrypted attributes in
Anton Altaparmakov [Thu, 8 Sep 2005 20:19:45 +0000 (21:19 +0100)]
NTFS: Fixup handling of sparse, compressed, and encrypted attributes in
      fs/ntfs/inode.c::ntfs_read_locked_{,attr_,index_}inode().

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years ago[BNX2]: Fix bug in irq handler and add prefetch
Michael Chan [Thu, 8 Sep 2005 20:15:32 +0000 (13:15 -0700)]
[BNX2]: Fix bug in irq handler and add prefetch

Fix bug in bnx2_interrupt() that caused an unnecessary register read.
The BNX2_PCICFG_MISC_STATUS should only be read when the status tag
has not changed.

Add prefetch of the status block in bnx2_msi() similar to tg3_msi().
The status block is not touched in bnx2_msi() and prefetching it will
speed up bnx2_poll() that will run on the same CPU that received the
MSI.

Update version.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agoNTFS: Truncate {a,c,m}time to the ntfs supported time granularity when
Anton Altaparmakov [Thu, 8 Sep 2005 20:15:09 +0000 (21:15 +0100)]
NTFS: Truncate {a,c,m}time to the ntfs supported time granularity when
      updating the times in the inode in ntfs_setattr().

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years agoNTFS: Fix cluster (de)allocators to work when the runlist is NULL and more
Anton Altaparmakov [Thu, 8 Sep 2005 20:09:06 +0000 (21:09 +0100)]
NTFS: Fix cluster (de)allocators to work when the runlist is NULL and more
      importantly to take a locked runlist rather than them locking it
      which leads to lock reversal.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years ago[I2C] Clean up i2c-pxa debugging/printks
Russell King [Thu, 8 Sep 2005 20:04:58 +0000 (21:04 +0100)]
[I2C] Clean up i2c-pxa debugging/printks

Fix up comments made by review by gregkh.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years agoNTFS: Fix handling of sparse attributes in ntfs_attr_make_non_resident().
Anton Altaparmakov [Thu, 8 Sep 2005 20:01:17 +0000 (21:01 +0100)]
NTFS: Fix handling of sparse attributes in ntfs_attr_make_non_resident().
      Also, add BUG() checks to ntfs_attr_make_non_resident() and
      ntfs_attr_set() to ensure that these functions are never called
      for compressed or encrypted attributes.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years agoMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6-git-rfc3542
David S. Miller [Thu, 8 Sep 2005 19:59:43 +0000 (12:59 -0700)]
Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6-git-rfc3542

18 years ago[IPV6]: Need to use pskb_trim_rcsum().
Stephen Hemminger [Thu, 8 Sep 2005 19:57:43 +0000 (12:57 -0700)]
[IPV6]: Need to use pskb_trim_rcsum().

Fix pskb_trim usage in ipv6. Only the udp one is really
a bug, other places are just doing equivalent code.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agoNTFS: Fix several bugs in fs/ntfs/attrib.c.
Anton Altaparmakov [Thu, 8 Sep 2005 19:56:09 +0000 (20:56 +0100)]
NTFS: Fix several bugs in fs/ntfs/attrib.c.

- Fix a bug in ntfs_map_runlist_nolock() where we forgot to protect
  access to the allocated size in the ntfs inode with the size lock.
- Fix ntfs_attr_vcn_to_lcn_nolock() and ntfs_attr_find_vcn_nolock() to
  return LCN_ENOENT when there is no runlist and the allocated size is
  zero.
- Fix load_attribute_list() to handle the case of a NULL runlist.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years agoNTFS: Add fs/ntfs/attrib.[hc]::ntfs_resident_attr_value_resize().
Anton Altaparmakov [Thu, 8 Sep 2005 19:40:32 +0000 (20:40 +0100)]
NTFS: Add fs/ntfs/attrib.[hc]::ntfs_resident_attr_value_resize().

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years agoNTFS: Remove bogus setting of PageError in ntfs_read_compressed_block().
Anton Altaparmakov [Thu, 8 Sep 2005 19:35:33 +0000 (20:35 +0100)]
NTFS: Remove bogus setting of PageError in ntfs_read_compressed_block().

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years ago[NET]: Need struct sock forward decl in net/compat.h
David S. Miller [Thu, 8 Sep 2005 19:32:46 +0000 (12:32 -0700)]
[NET]: Need struct sock forward decl in net/compat.h

Else we get build failures like:

  CC      arch/sparc64/kernel/sparc64_ksyms.o
In file included from arch/sparc64/kernel/sparc64_ksyms.c:28:
include/net/compat.h:37: warning: "struct sock" declared inside parameter list
include/net/compat.h:37: warning: its scope is only this definition or declaration, which is probably not what you want

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[IPV4] udp: trim forgets about CHECKSUM_HW
Stephen Hemminger [Thu, 8 Sep 2005 19:32:21 +0000 (12:32 -0700)]
[IPV4] udp: trim forgets about CHECKSUM_HW

A UDP packet may contain extra data that needs to be trimmed off.
But when doing so, UDP forgets to fixup the skb checksum if CHECKSUM_HW
is being used.

I think this explains the case of a NFS receive using skge driver
causing 'udp hw checksum failures' when interacting with a crufty
settop box.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[NET]: Optimize pskb_trim_rcsum()
Stephen Hemminger [Thu, 8 Sep 2005 19:32:03 +0000 (12:32 -0700)]
[NET]: Optimize pskb_trim_rcsum()

Since packets almost never contain extra garbage at the end, it is
worthwhile to optimize for that case.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
18 years agoNTFS: Fix a bug in fs/ntfs/index.c::ntfs_index_lookup(). When the returned
Anton Altaparmakov [Thu, 8 Sep 2005 19:29:50 +0000 (20:29 +0100)]
NTFS: Fix a bug in fs/ntfs/index.c::ntfs_index_lookup().  When the returned
      index entry is in the index root, we forgot to set the @ir pointer in
      the index context.  Thanks for Yura Pakhuchiy for finding this bug.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years agoNTFS: Add ntfs_rl_punch_nolock() which punches a caller specified hole into a runlist.
Anton Altaparmakov [Thu, 8 Sep 2005 19:26:34 +0000 (20:26 +0100)]
NTFS: Add ntfs_rl_punch_nolock() which punches a caller specified hole into a runlist.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years agoNTFS: Change ntfs_rl_truncate_nolock() to throw away the runlist if the new
Anton Altaparmakov [Thu, 8 Sep 2005 19:23:06 +0000 (20:23 +0100)]
NTFS: Change ntfs_rl_truncate_nolock() to throw away the runlist if the new
      length is zero.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years agoMerge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Linus Torvalds [Thu, 8 Sep 2005 18:51:01 +0000 (11:51 -0700)]
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

18 years ago[MMC] Allow detection/removal to be delayed
Richard Purdie [Thu, 8 Sep 2005 16:53:01 +0000 (17:53 +0100)]
[MMC] Allow detection/removal to be delayed

Change mmc_detect_change() to take a delay argument such that
the detection of card insertions and removals can be delayed
according to the requirements of the host driver or platform.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years agoNTFS: Report unrepresentable inodes during ntfs_readdir() as KERN_WARNING
Anton Altaparmakov [Thu, 8 Sep 2005 16:04:11 +0000 (17:04 +0100)]
NTFS: Report unrepresentable inodes during ntfs_readdir() as KERN_WARNING
      messages and include the inode number.  Thanks to Yura Pakhuchiy for
      pointing this out.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years agoNTFS: Fix handling of valid but empty mapping pairs array in
Anton Altaparmakov [Thu, 8 Sep 2005 15:52:31 +0000 (16:52 +0100)]
NTFS: Fix handling of valid but empty mapping pairs array in
      fs/ntfs/runlist.c::ntfs_mapping_pairs_decompress().

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years agoNTFS: Remove two bogus BUG_ON()s from fs/ntfs/mft.c.
Anton Altaparmakov [Thu, 8 Sep 2005 15:48:28 +0000 (16:48 +0100)]
NTFS: Remove two bogus BUG_ON()s from fs/ntfs/mft.c.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years agoNTFS: Fix two nasty runlist merging bugs that had gone unnoticed so far.
Anton Altaparmakov [Thu, 8 Sep 2005 15:46:55 +0000 (16:46 +0100)]
NTFS: Fix two nasty runlist merging bugs that had gone unnoticed so far.
      Thanks to Stefano Picerno for the bug report.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years agoNTFS: Use ntfs_malloc_nofs_nofail() in runlist.c::ntfs_runlists_merge()
Anton Altaparmakov [Thu, 8 Sep 2005 15:33:12 +0000 (16:33 +0100)]
NTFS: Use ntfs_malloc_nofs_nofail() in runlist.c::ntfs_runlists_merge()
      in the two critical regions.  This means we no longer need to
      panic() when the allocation fails as it now cannot fail.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years agoNTFS: Allow highmem kmalloc() in ntfs_malloc_nofs() and add _nofail() version.
Anton Altaparmakov [Thu, 8 Sep 2005 15:28:25 +0000 (16:28 +0100)]
NTFS: Allow highmem kmalloc() in ntfs_malloc_nofs() and add _nofail() version.

- Modify fs/ntfs/malloc.h::ntfs_malloc_nofs() to do the kmalloc() based
  allocations with __GFP_HIGHMEM, analogous to how the vmalloc() based
  allocations are done.
- Add fs/ntfs/malloc.h::ntfs_malloc_nofs_nofail() which is analogous to
  ntfs_malloc_nofs() but it performs allocations with __GFP_NOFAIL and
  hence cannot fail.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years ago[PATCH] Fix 32bit sendmsg() flaw
Al Viro [Thu, 8 Sep 2005 01:28:51 +0000 (18:28 -0700)]
[PATCH] Fix 32bit sendmsg() flaw

When we copy 32bit ->msg_control contents to kernel, we walk the same
userland data twice without sanity checks on the second pass.

Second version of this patch: the original broke with 64-bit arches
running 32-bit-compat-mode executables doing sendmsg() syscalls with
unaligned CMSG data areas

Another thing is that we use kmalloc() to allocate and sock_kfree_s()
to free afterwards; less serious, but also needs fixing.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years agoNTFS: Support more clean journal ($LogFile) states.
Anton Altaparmakov [Thu, 8 Sep 2005 15:12:28 +0000 (16:12 +0100)]
NTFS: Support more clean journal ($LogFile) states.

      - Support journals ($LogFile) which have been modified by chkdsk.  This
        means users can boot into Windows after we marked the volume dirty.
        The Windows boot will run chkdsk and then reboot.  The user can then
        immediately boot into Linux rather than having to do a full Windows
        boot first before rebooting into Linux and we will recognize such a
        journal and empty it as it is clean by definition.
      - Support journals ($LogFile) with only one restart page as well as
        journals with two different restart pages.  We sanity check both and
        either use the only sane one or the more recent one of the two in the
        case that both are valid.

Signed-off-by: Anton Altaparmakov <aia21@cantab.net>
18 years ago[SERIAL] Use an enum for serial8250 platform device IDs
Russell King [Thu, 8 Sep 2005 15:04:41 +0000 (16:04 +0100)]
[SERIAL] Use an enum for serial8250 platform device IDs

Rather than hard-coding the platform device IDs, enumerate them.
We don't particularly care about the actual ID we get, just as
long as they're unique.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[PATCH] ppc32: Fix head_4xx.S compile error
Kumar Gala [Thu, 8 Sep 2005 14:20:55 +0000 (09:20 -0500)]
[PATCH] ppc32: Fix head_4xx.S compile error

head_4xx.S wasn't compiling due to a missing #endif

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[ARM] Fix ARMv6 VIPT cache >= 32K
Russell King [Thu, 8 Sep 2005 14:32:23 +0000 (15:32 +0100)]
[ARM] Fix ARMv6 VIPT cache >= 32K

This adds the necessary changes to ensure that we flush the
caches correctly with aliasing VIPT caches.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years agoMerge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux...
Linus Torvalds [Thu, 8 Sep 2005 14:21:59 +0000 (07:21 -0700)]
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

18 years ago[ARM] Add suspend/resume support to locomo.c
John Lenz [Thu, 8 Sep 2005 13:41:54 +0000 (14:41 +0100)]
[ARM] Add suspend/resume support to locomo.c

This adds low-level suspend/resume support to locomo.c.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
18 years ago[PATCH] scan all enabled ports on ata_piix
Hannes Reinecke [Wed, 29 Jun 2005 00:30:38 +0000 (17:30 -0700)]
[PATCH] scan all enabled ports on ata_piix

ICH6 spec defines the PORT_ bits as:

PORT_ENABLED (R/W):

  0 = Disabled.  The port is in the off state and cannot detect any
  devices.

  1 = Enabled.  The port can transition between the on, partial, and
  slumber states and can detect devices.

PORT_PRESENT  (R/O)

  The status of this bit may change at any time.  This bit is cleared
  when the port is disabled via PORT_ENABLED.  This bit is not cleared upon
  surprise removal of a device.

So from a textual view it is not necessary that PORT_PRESENT _must_ be set,
especially if a device detection has to be done anyway.  And, in fact, this
is the view that ACER has been taken with its new Laptops (e.g.  Travelmate
4150).

And the definition of PORT_ENABLED / PORT_PRESENT is mixed up, btw.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@suse.de>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years agoMerge /spare/repo/linux-2.6/
Jeff Garzik [Thu, 8 Sep 2005 09:37:58 +0000 (05:37 -0400)]
Merge /spare/repo/linux-2.6/

18 years agoMerge linux-2.6 with linux-acpi-2.6
Len Brown [Thu, 8 Sep 2005 05:45:47 +0000 (01:45 -0400)]
Merge linux-2.6 with linux-acpi-2.6

18 years ago[XFS] Fix modular XFS builds (Makefile botch).
Nathan Scott [Thu, 8 Sep 2005 05:38:52 +0000 (15:38 +1000)]
[XFS] Fix modular XFS builds (Makefile botch).

Signed-off-by: Nathan Scott <nathans@sgi.com>
18 years ago[XFS] Remove special Kconfig XFS menu, make XFS options "inline".
Nathan Scott [Thu, 8 Sep 2005 05:34:58 +0000 (15:34 +1000)]
[XFS] Remove special Kconfig XFS menu, make XFS options "inline".

Signed-off-by: Eric Sandeen <sandeen@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
18 years ago[XFS] Cleanup some -Wundef flag warnings in the endian macros (thanks
Nathan Scott [Thu, 8 Sep 2005 05:30:05 +0000 (15:30 +1000)]
[XFS] Cleanup some -Wundef flag warnings in the endian macros (thanks
Christoph).

SGI-PV: 942400
SGI-Modid: xfs-linux-melb:xfs-kern:23771a

Signed-off-by: Nathan Scott <nathans@sgi.com>
18 years ago[SCSI] Re-do "final klist fixes"
Linus Torvalds [Thu, 8 Sep 2005 01:44:33 +0000 (18:44 -0700)]
[SCSI] Re-do "final klist fixes"

With the previous commit that introduces the klist enhancements, we can
now re-do 2b7d6a8cb9718fc1d9e826201b64909c44a915f4 again.

18 years ago[PATCH] fix klist semantics for lists which have elements removed on traversal
James Bottomley [Tue, 6 Sep 2005 23:56:51 +0000 (16:56 -0700)]
[PATCH] fix klist semantics for lists which have elements removed on traversal

The problem is that klists claim to provide semantics for safe traversal of
lists which are being modified.  The failure case is when traversal of a
list causes element removal (a fairly common case).  The issue is that
although the list node is refcounted, if it is embedded in an object (which
is universally the case), then the object will be freed regardless of the
klist refcount leading to slab corruption because the klist iterator refers
to the prior element to get the next.

The solution is to make the klist take and release references to the
embedding object meaning that the embedding object won't be released until
the list relinquishes the reference to it.

(akpm: fast-track this because it's needed for the 2.6.13 scsi merge)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[IPV6]: Support IPV6_{RECV,}TCLASS socket options / ancillary data.
YOSHIFUJI Hideaki [Thu, 8 Sep 2005 01:19:03 +0000 (10:19 +0900)]
[IPV6]: Support IPV6_{RECV,}TCLASS socket options / ancillary data.

Based on patch from David L Stevens <dlstevens@us.ibm.com>

Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
18 years ago[IPV6]: Support several new sockopt / ancillary data in Advanced API (RFC3542).
YOSHIFUJI Hideaki [Thu, 8 Sep 2005 00:59:17 +0000 (09:59 +0900)]
[IPV6]: Support several new sockopt / ancillary data in Advanced API (RFC3542).

Support several new socket options / ancillary data:
  IPV6_RECVPKTINFO, IPV6_PKTINFO,
  IPV6_RECVHOPOPTS, IPV6_HOPOPTS,
  IPV6_RECVDSTOPTS, IPV6_DSTOPTS, IPV6_RTHDRDSTOPTS,
  IPV6_RECVRTHDR, IPV6_RTHDR,
  IPV6_RECVHOPOPTS, IPV6_HOPOPTS

Old semantics are preserved as IPV6_2292xxxx so that
we can maintain backward compatibility.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
18 years ago[SCSI] Revert "final klist fixes"
Linus Torvalds [Thu, 8 Sep 2005 00:50:58 +0000 (17:50 -0700)]
[SCSI] Revert "final klist fixes"

Revert commit 2b7d6a8cb9718fc1d9e826201b64909c44a915f4.

The "fix" was known to not even compile.  Duh.  That's not a fix.
That's just stupid.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] sata_sis: Add support for SiS182 chipset
Arnaud Patard [Wed, 7 Sep 2005 20:44:48 +0000 (22:44 +0200)]
[PATCH] sata_sis: Add support for SiS182 chipset

This patch adds support for the SiS182 sata chipset. This is a
minimalistic version of the patch from
http://bugme.osdl.org/show_bug.cgi?id=4192. Basically, it add the PCI
IDs and handles the change of the 2nd port adress register.

Signed-Off-By: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Linus Torvalds [Thu, 8 Sep 2005 00:31:27 +0000 (17:31 -0700)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

18 years agoMerge branch 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Linus Torvalds [Thu, 8 Sep 2005 00:29:07 +0000 (17:29 -0700)]
Merge branch 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

18 years agoMerge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
Linus Torvalds [Thu, 8 Sep 2005 00:28:25 +0000 (17:28 -0700)]
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6

18 years agoMerge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Linus Torvalds [Thu, 8 Sep 2005 00:27:39 +0000 (17:27 -0700)]
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

18 years agoMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
Linus Torvalds [Thu, 8 Sep 2005 00:23:52 +0000 (17:23 -0700)]
Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

18 years agoMerge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Linus Torvalds [Thu, 8 Sep 2005 00:22:43 +0000 (17:22 -0700)]
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Thu, 8 Sep 2005 00:21:17 +0000 (17:21 -0700)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Thu, 8 Sep 2005 00:20:11 +0000 (17:20 -0700)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

18 years ago[PATCH] bogus #if (simserial)
viro@ZenIV.linux.org.uk [Wed, 7 Sep 2005 22:23:50 +0000 (23:23 +0100)]
[PATCH] bogus #if (simserial)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] CHECKFLAGS on ppc64 got broken
viro@ZenIV.linux.org.uk [Wed, 7 Sep 2005 22:28:32 +0000 (23:28 +0100)]
[PATCH] CHECKFLAGS on ppc64 got broken

Now that asm-powerpc/* is using ifdefs on __powerpc64__ we need to add it
to CHECKFLAGS on ppc64.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] bogus #if (ncr53c406)
viro@ZenIV.linux.org.uk [Wed, 7 Sep 2005 22:26:35 +0000 (23:26 +0100)]
[PATCH] bogus #if (ncr53c406)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] bogus #if (smc91x.h)
viro@ZenIV.linux.org.uk [Wed, 7 Sep 2005 22:25:15 +0000 (23:25 +0100)]
[PATCH] bogus #if (smc91x.h)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] bogus #if (arch/um/kernel/mem.c)
viro@ZenIV.linux.org.uk [Wed, 7 Sep 2005 22:21:11 +0000 (23:21 +0100)]
[PATCH] bogus #if (arch/um/kernel/mem.c)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] -Wundef fixes (hisax)
viro@ZenIV.linux.org.uk [Wed, 7 Sep 2005 22:19:41 +0000 (23:19 +0100)]
[PATCH] -Wundef fixes (hisax)

CARD_... in hisax are all used with #if; CARD_FN_ENTERNOW_PCI lacks define
to 0 if corresponding config option is not set.

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