15 years ago[PATCH] sem2mutex: mm/slab.c
Ingo Molnar [Thu, 19 Jan 2006 01:42:33 +0000]
[PATCH] sem2mutex: mm/slab.c

Convert mm/swapfile.c's swapon_sem to swapon_mutex.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] Zone reclaim: proc override
Christoph Lameter [Thu, 19 Jan 2006 01:42:32 +0000]
[PATCH] Zone reclaim: proc override

proc support for zone reclaim

This patch creates a proc entry /proc/sys/vm/zone_reclaim_mode that may be
used to override the automatic determination of the zone reclaim made on
bootup.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] Zone reclaim: Reclaim logic
Christoph Lameter [Thu, 19 Jan 2006 01:42:31 +0000]
[PATCH] Zone reclaim: Reclaim logic

Some bits for zone reclaim exists in 2.6.15 but they are not usable.  This
patch fixes them up, removes unused code and makes zone reclaim usable.

Zone reclaim allows the reclaiming of pages from a zone if the number of
free pages falls below the watermarks even if other zones still have enough
pages available.  Zone reclaim is of particular importance for NUMA
machines.  It can be more beneficial to reclaim a page than taking the
performance penalties that come with allocating a page on a remote zone.

Zone reclaim is enabled if the maximum distance to another node is higher
than RECLAIM_DISTANCE, which may be defined by an arch.  By default
RECLAIM_DISTANCE is 20.  20 is the distance to another node in the same
component (enclosure or motherboard) on IA64.  The meaning of the NUMA
distance information seems to vary by arch.

If zone reclaim is not successful then no further reclaim attempts will
occur for a certain time period (ZONE_RECLAIM_INTERVAL).

This patch was discussed before. See

http://marc.theaimsgroup.com/?l=linux-kernel&m=113519961504207&w=2
http://marc.theaimsgroup.com/?l=linux-kernel&m=113408418232531&w=2
http://marc.theaimsgroup.com/?l=linux-kernel&m=113389027420032&w=2
http://marc.theaimsgroup.com/?l=linux-kernel&m=113380938612205&w=2

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] Zone reclaim: resurrect may_swap
Christoph Lameter [Thu, 19 Jan 2006 01:42:30 +0000]
[PATCH] Zone reclaim: resurrect may_swap

Zone reclaim has a huge impact on NUMA performance (f.e.  our maximum
throughput with XFS is raised from 4GB to 6GB/sec / page cache contamination
of numa nodes destroys locality if one just does a large copy operation which
results in performance dropping for good until reboot).

This patch:

Resurrect may_swap in struct scan_control

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] Simplify migrate_page_add
Christoph Lameter [Thu, 19 Jan 2006 01:42:29 +0000]
[PATCH] Simplify migrate_page_add

Simplify migrate_page_add after feedback from Hugh.  This also allows us to
drop one parameter from migrate_page_add.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] mm: migration page refcounting fix
Nick Piggin [Thu, 19 Jan 2006 01:42:27 +0000]
[PATCH] mm: migration page refcounting fix

Migration code currently does not take a reference to target page
properly, so between unlocking the pte and trying to take a new
reference to the page with isolate_lru_page, anything could happen to
it.

Fix this by holding the pte lock until we get a chance to elevate the
refcount.

Other small cleanups while we're here.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] mm: dirty_exceeded speedup
Andrew Morton [Thu, 19 Jan 2006 01:42:26 +0000]
[PATCH] mm: dirty_exceeded speedup

Ravikiran reports that this variable is bouncing all around nodes on NUMA
machines, causing measurable performance problems.  Fix that up by only
writing to it when it actually changed.

And put it in a new cacheline to prevent it sharing with other things (this
happened).

Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] Prevent trident driver from grabbing pcnet32 hardware
Jon Mason [Thu, 19 Jan 2006 01:42:25 +0000]
[PATCH] Prevent trident driver from grabbing pcnet32 hardware

Some pcnet32 hardware erroneously has the Vendor ID for Trident.  The
pcnet32 driver looks for the PCI ethernet class before grabbing the
hardware, but the current trident driver does not check against the PCI
audio class.  This allows the trident driver to claim the pcnet32 hardware.
 This patch prevents that.

This revised version of the OSS Trident patch includes PCI_DEVICE Macro
usage.

Signed-off-by: Jon Mason <jdmason@us.ibm.com>
Signed-off-by: Muli Ben-Yehuda <mulix@mulix.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] synclink_gt fix size of register value storage
Paul Fulghum [Thu, 19 Jan 2006 01:42:24 +0000]
[PATCH] synclink_gt fix size of register value storage

Fix incorrect variable size used to hold register value.  This bug might
wipe out a portion of the TCR value when setting the interface options.

Signed-off-by: Paul Fulghum <paulkf@microgate.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] scsi_transport_spi build fix
Andrew Morton [Thu, 19 Jan 2006 01:42:22 +0000]
[PATCH] scsi_transport_spi build fix

On alpha:

In file included from drivers/scsi/sym53c8xx_2/sym_glue.h:59,
                 from drivers/scsi/sym53c8xx_2/sym_fw.c:40:
include/scsi/scsi_transport_spi.h:57: error: field `dv_mutex' has incomplete type

Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] x86_64: Fix MCE exception stack for boot CPU
Jan Beulich [Thu, 19 Jan 2006 01:42:21 +0000]
[PATCH] x86_64: Fix MCE exception stack for boot CPU

Fix a typo/mis-merge in one of the previous patches.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] jbd: remove_transaction fix
Jan Kara [Thu, 19 Jan 2006 01:42:20 +0000]
[PATCH] jbd: remove_transaction fix

We have to check that also the second checkpoint list is non-empty before
dropping the transaction.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] jbd: log_do_checkpoint fix
Jan Kara [Thu, 19 Jan 2006 01:42:19 +0000]
[PATCH] jbd: log_do_checkpoint fix

While checkpointing we have to check that our transaction still is in the
checkpoint list *and* (not or) that it's not just a different transaction
with the same address.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years agoMerge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds [Wed, 18 Jan 2006 23:19:40 +0000]
Merge master.kernel.org:/home/rmk/linux-2.6-serial

15 years agoMerge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Wed, 18 Jan 2006 23:18:53 +0000]
Merge master.kernel.org:/home/rmk/linux-2.6-arm

15 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Wed, 18 Jan 2006 23:08:16 +0000]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

15 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Wed, 18 Jan 2006 23:08:02 +0000]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

15 years ago[SPARC64]: Fix build with CONFIG_COMPAT disabled.
David S. Miller [Wed, 18 Jan 2006 22:58:05 +0000]
[SPARC64]: Fix build with CONFIG_COMPAT disabled.

Based upon a report and preliminary patch from Jim Gifford.

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

15 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream
Russell King [Wed, 18 Jan 2006 22:56:29 +0000]
Merge /linux/kernel/git/tmlind/linux-omap-upstream

15 years ago[SPARC64]: Serial Console for E250 Patch
Eddie C. Dost [Wed, 18 Jan 2006 22:54:31 +0000]
[SPARC64]: Serial Console for E250 Patch

From: Eddie C. Dost <ecd@brainaid.de>

I have the following patch for serial console over the RSC
(remote system controller) on my E250 machine. It basically adds
support for input-device=rsc and output-device=rsc from OBP, and
allows 115200,8,n,1,- serial mode setting.

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

15 years ago[MAINTAINERS]: add entry for wireless networking
John W. Linville [Wed, 18 Jan 2006 22:52:48 +0000]
[MAINTAINERS]: add entry for wireless networking

Add an entry to MAINTAINERS for wireless networking, just so people
know whom to bless with patches.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[MAINTAINERS]: correct location for net-2.6.git
John W. Linville [Wed, 18 Jan 2006 22:52:18 +0000]
[MAINTAINERS]: correct location for net-2.6.git

Correct location info for net-2.6 git tree.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[ARM] 3281/1: ixp4xx: export ixp4xx_exp_bus_size for modules
David Vrabel [Wed, 18 Jan 2006 22:46:43 +0000]
[ARM] 3281/1: ixp4xx: export ixp4xx_exp_bus_size for modules

Patch from David Vrabel

Export ixp4xx_exp_bus_size so modules can use the IXP4XX_EXP_BUS_BASE(n) macro.

Also, fix a printk format warning.

Signed-off-by: David Vrabel <dvrabel@arcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

15 years ago[ARM] 3272/1: fix kernel decompressor crash
Nicolas Pitre [Wed, 18 Jan 2006 22:38:51 +0000]
[ARM] 3272/1: fix kernel decompressor crash

Patch from Nicolas Pitre

Commit f4619025a51747a3788fd1bb6bdc46e368a889a7 broke the kernel
decompressor (at least on PXA).  Here's the fix.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

15 years ago[ARM] 3271/1: ARM EABI: fix calling of cmpxchg syscall emulation
Nicolas Pitre [Wed, 18 Jan 2006 22:38:49 +0000]
[ARM] 3271/1: ARM EABI: fix calling of cmpxchg syscall emulation

Patch from Nicolas Pitre

This is kernel provided user space code.

Since a syscall is used, it has to be updated to work with EABI.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

15 years ago[ARM] 3270/1: ARM EABI: fix sigreturn and rt_sigreturn
Nicolas Pitre [Wed, 18 Jan 2006 22:38:47 +0000]
[ARM] 3270/1: ARM EABI: fix sigreturn and rt_sigreturn

Patch from Nicolas Pitre

The signal return path consists of user code provided by the kernel.
Since a syscall is used, it has to be updated to work with EABI.

Noticed by Daniel Jacobowitz.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

15 years ago[ARM] 3268/1: AT91RM9200 serial update for 2.6.15-git12
Andrew Victor [Wed, 18 Jan 2006 22:38:46 +0000]
[ARM] 3268/1: AT91RM9200 serial update for 2.6.15-git12

Patch from Andrew Victor

This patch fixes two small issues with 2.6.15-git12.

1) Corrected major/minor numbers for ttyAT devices in the KConfig help.
   (Patch from Karl Olsen)

2) tty->flip.count has been removed.

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

15 years ago[ARM] 3267/1: PXA27x SSP controller register defines
David Vrabel [Wed, 18 Jan 2006 22:38:44 +0000]
[ARM] 3267/1: PXA27x SSP controller register defines

Patch from David Vrabel

PXA27x SSP controller has a few different registers, including SCR (serial clock rate) in SSCR0.

Signed-off-by: David Vrabel <dvrabel@arcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

15 years agoMerge git://tipc.cslab.ericsson.net/pub/git/tipc
David S. Miller [Wed, 18 Jan 2006 22:23:54 +0000]
Merge git://tipc.cslab.ericsson.net/pub/git/tipc

15 years ago[IPV4]: Fix multiple bugs in IGMPv3
David L Stevens [Wed, 18 Jan 2006 22:20:56 +0000]
[IPV4]: Fix multiple bugs in IGMPv3

1) fix "mld_marksources()" to
        a) send nothing when all queried sources are excluded
        b) send full exclude report when source queried sources are
                not excluded
        c) don't schedule a timer when there's nothing to report

2) fix "add_grec()" to send empty-source records when it should
        The original check doesn't account for a non-empty source
        list with all sources inactive; the new code keeps that
        short-circuit case, and also generates the group header
        with an empty list if needed.

3) fix mca_crcount decrement to be after add_grec(), which needs
        its original value

4) add/remove delete records and prevent current advertisements
        when an exclude-mode filter moves from "active" to "inactive"
        or vice versa based on new filter additions.

        Items 1-3 are just IPv4 versions of the IPv6 bugs found
by Yan Zheng and fixed earlier. Item #4 is a related bug that
affects exclude-mode change records only (but not queries) and
also occurs in IPv6 (IPv6 version coming soon).

Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[PKTGEN]: Respect hard_header_len of device.
David S. Miller [Wed, 18 Jan 2006 22:19:10 +0000]
[PKTGEN]: Respect hard_header_len of device.

Don't assume 16.

Found by Ben Greear.

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

15 years ago[IRDA]: maintainer status
Stephen Hemminger [Wed, 18 Jan 2006 22:06:59 +0000]
[IRDA]: maintainer status

Jean says he really doesn't have time to much IRDA any more.
The following would help motivate someone who has more time.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[CASSINI]: dont touch page_count
Nick Piggin [Wed, 18 Jan 2006 22:05:16 +0000]
[CASSINI]: dont touch page_count

Remove page refcount manipulations from cassini driver by using
another field in struct page. Needed for lockless pagecache.

Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[SPARC64]: Update defconfig.
David S. Miller [Wed, 18 Jan 2006 21:41:36 +0000]
[SPARC64]: Update defconfig.

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

15 years ago[PATCH] e1000: fix compile warning
Jesse Brandeburg [Wed, 18 Jan 2006 21:01:45 +0000]
[PATCH] e1000: fix compile warning

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] e1000: fix receive breakage
Jesse Brandeburg [Wed, 18 Jan 2006 21:01:43 +0000]
[PATCH] e1000: fix receive breakage

in attempting to not send the "prefetch" patch, we broke the receive code,
this patch fixes that issue.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] e1000: Added driver comments
Jesse Brandeburg [Wed, 18 Jan 2006 21:01:41 +0000]
[PATCH] e1000: Added driver comments

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] e1000: Fix whitespace
Jesse Brandeburg [Wed, 18 Jan 2006 21:01:39 +0000]
[PATCH] e1000: Fix whitespace

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] e1000: Added functions declarations
Jesse Brandeburg [Wed, 18 Jan 2006 21:01:37 +0000]
[PATCH] e1000: Added functions declarations

Added e1000_mc_addr_list_update
Added e1000_read_reg_io
Added e1000_enable_pciex_master

These are not static functions, that is why we have them declared in the header.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] e1000: Added functions to save and restore config
Jesse Brandeburg [Wed, 18 Jan 2006 21:01:34 +0000]
[PATCH] e1000: Added functions to save and restore config

These functions help restore the driver to active configuration when coming out of resume for power management.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] e1000: Added RX buffer enhancements
Jesse Brandeburg [Wed, 18 Jan 2006 21:01:32 +0000]
[PATCH] e1000: Added RX buffer enhancements

Align the prefetches to a dword to help speed them up.
Recycle skb's and early replenish.
Force memory writes to complete before fetching more descriptors.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] e1000: Added disable packet split capability
Jesse Brandeburg [Wed, 18 Jan 2006 21:01:30 +0000]
[PATCH] e1000: Added disable packet split capability

Adds the ability to disability packet split at compile time and use the legacy receive path on PCI express hardware.  Made this a CONFIG option and modified the Kconfig, to reflect the new option.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[SERIAL] Add 8250 support for Decision Computer International Co. PCCOM2
Alon Bar-Lev [Wed, 18 Jan 2006 11:47:33 +0000]
[SERIAL] Add 8250 support for Decision Computer International Co. PCCOM2

There is a new device which is look like:

Serial controller: Decision Computer International Co. PCCOM2 (rev 02) (prog-if 02 [16550])
0700: 6666:0004 (rev 02) (prog-if 02)
Flags: medium devsel, IRQ 177
Memory at fe000000 (32-bit, non-prefetchable) [size=128]
I/O ports at e880 [size=128]
I/O ports at e400 [size=256]

It has two 16550A, and is not listed in kernel, although the
manufacturer clams that it is supported...

I've created the following patch, it only add the new PCI id and the
card to the repository, it seems to work.

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

15 years ago[SERIAL] Fix serial8250 driver initialisation ordering
Russell King [Wed, 18 Jan 2006 09:54:29 +0000]
[SERIAL] Fix serial8250 driver initialisation ordering

Commit 7493a314cb83797ce612a577475aacaedc553fed changed the ordering
of the registration of the platform device driver vs the 8250 drivers
internal initialisation.  This led to the probe function being called
before the driver had finished its internal initialisation, causing
mayhem.  Revert the ordering change.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

15 years ago[IPV4]: RT_CACHE_STAT_INC() warning fix
Andrew Morton [Wed, 18 Jan 2006 05:58:01 +0000]
[IPV4]: RT_CACHE_STAT_INC() warning fix

BUG: using smp_processor_id() in preemptible [00000001] code: rpc.statd/2408

And it _is_ a bug, but I guess we don't care enough to add preempt_disable().

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years agoMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
Linus Torvalds [Wed, 18 Jan 2006 03:48:07 +0000]
Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

15 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Wed, 18 Jan 2006 03:47:31 +0000]
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/libata-dev

15 years agoMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Wed, 18 Jan 2006 03:46:46 +0000]
Merge branch 'upstream-linus' of /linux/kernel/git/jgarzik/netdev-2.6

15 years ago[XFS] Fix a race in xfs_submit_ioend() where we can be completing I/O for
David Chinner [Wed, 18 Jan 2006 02:38:12 +0000]
[XFS] Fix a race in xfs_submit_ioend() where we can be completing I/O for
a page while we are still submitting other buffers on the same page for
I/O.

SGI-PV: 948197
SGI-Modid: xfs-linux-melb:xfs-kern:25004a

Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>

15 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Wed, 18 Jan 2006 01:32:22 +0000]
Merge /pub/scm/linux/kernel/git/davem/net-2.6

15 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Wed, 18 Jan 2006 01:19:53 +0000]
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

15 years ago[PATCH] Fix sparse parse error in lppaca.h
Bryan O'Sullivan [Wed, 18 Jan 2006 01:00:05 +0000]
[PATCH] Fix sparse parse error in lppaca.h

sparse can't parse a struct definition in include/asm-powerpc/lppaca.h,
even though gcc can accept it.  The form looks like this:

        struct __attribute__((whatever)) foo { };

An equivalent that both gcc and sparse can handle is

        struct foo { } __attribute__((whatever));

This is the only definition of this type in the tree, and fixing it is
easier than fixing sparse.

Signed-off-by: Bryan O'Sullivan <bos@serpentine.com>
[ Side note: fixing sparse wouldn't be hard, but the "attribute at the
  end" version is the canonical one, and the one that makes sense. So
  let's just fix the kernel instead. Luc Van Oostenryck already sent
  out a sparse patch to the sparse mailing list in case anybody cares.
               -- Linus ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

15 years ago[PATCH] skge: fix dma mask setup.
Stephen Hemminger [Fri, 6 Jan 2006 00:26:05 +0000]
[PATCH] skge: fix dma mask setup.

There are a couple of problems in the DMA setup code for skge.
* In the 64 bit case, it doesn't set the consistent mask.
* In the 32 bit case, the error check is backwards!
It likely will only be visible as a bug on 64 bit platforms.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] libata: Code for the IRQ mask flag
Alan Cox [Tue, 17 Jan 2006 20:53:50 +0000]
[PATCH] libata: Code for the IRQ mask flag

Signed-off-by: Alan Cox <alan@redhat.com>

Somewhat cleaner in the resync as someone cleaned up the pio xfer users
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] libata: Fix sector lock to apply to both drives not drive 0 twice
Alan Cox [Tue, 17 Jan 2006 20:51:55 +0000]
[PATCH] libata: Fix sector lock to apply to both drives not drive 0 twice

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] libata: Fix heuristic typos add LBA48PIO flag and support code, add IRQ flag...
Alan Cox [Tue, 17 Jan 2006 20:50:31 +0000]
[PATCH] libata: Fix heuristic typos add LBA48PIO flag and support code, add IRQ flag for next diff

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] Intel ICH8 SATA: add PCI device IDs
Jason Gaston [Tue, 17 Jan 2006 20:28:48 +0000]
[PATCH] Intel ICH8 SATA: add PCI device IDs

Signed-off-by:  Jason Gaston <Jason.d.gaston@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] Fix warning with b44.c on 64bit boxes
Alan Cox [Tue, 17 Jan 2006 17:53:56 +0000]
[PATCH] Fix warning with b44.c on 64bit boxes

sizeof() return is not an int, so use max_t to get the types right.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] sky2: 0.13 version
Stephen Hemminger [Tue, 17 Jan 2006 21:43:21 +0000]
[PATCH] sky2: 0.13 version

Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] sky2: more conservative transmit locking
Stephen Hemminger [Tue, 17 Jan 2006 21:43:20 +0000]
[PATCH] sky2: more conservative transmit locking

Be more careful about transmit locking, this solves a possible race
between tx_complete and transmit, that would cause a tx timeout.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] sky2: don't inline so much
Stephen Hemminger [Tue, 17 Jan 2006 21:43:19 +0000]
[PATCH] sky2: don't inline so much

Don't need to inline quite so many routines, let the compiler
decide

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] sky2: use kzalloc
Stephen Hemminger [Tue, 17 Jan 2006 21:43:18 +0000]
[PATCH] sky2: use kzalloc

Can use kzalloc here.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] sky2: ratelimit error messages
Stephen Hemminger [Tue, 17 Jan 2006 21:43:17 +0000]
[PATCH] sky2: ratelimit error messages

Make sure and rate limit all the error messages that might occur. If a problem
occurs then a few messages are enough.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] sky2: optimize for 32 bit dma
Stephen Hemminger [Tue, 17 Jan 2006 21:43:16 +0000]
[PATCH] sky2: optimize for 32 bit dma

Small optimization, if dma addresses are 32 bits, then high
bits are always zero.

Signed-off-by: Stephen Hemminger <shemminger@osdl.or>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] sky2: don't bother clearing status ring elements
Stephen Hemminger [Tue, 17 Jan 2006 21:43:15 +0000]
[PATCH] sky2: don't bother clearing status ring elements

Don't need to zero out the status ring entries after processing.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] sky2: write barrier's
Stephen Hemminger [Tue, 17 Jan 2006 21:43:14 +0000]
[PATCH] sky2: write barrier's

Be more careful about memory barriers. The only place we really
need them is before and after updating the chip's ring interface.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] sky2: fix ram buffer for Yukon FE rev 2
Stephen Hemminger [Tue, 17 Jan 2006 21:43:13 +0000]
[PATCH] sky2: fix ram buffer for Yukon FE rev 2

Fix problems with Yukon FE rev 2 chipset. Don't cut and paste bugs in from
sk98lin driver. Change how the ram buffer is divided up, and make the math
clearer. Also, set the thresholds where rx takes precedence. The threshold
values are just guesses at this point, it might be worth tuning them later.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] sky2: version 0.12
Stephen Hemminger [Tue, 17 Jan 2006 21:43:12 +0000]
[PATCH] sky2: version 0.12

Version update.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] sky2: call pci_set_consistent_dma_mask
Stephen Hemminger [Tue, 17 Jan 2006 21:43:11 +0000]
[PATCH] sky2: call pci_set_consistent_dma_mask

Need to call pci_set_consistent_dma_mask in the case of 64 bit
DMA.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] sky2: receive buffer alignment
Stephen Hemminger [Tue, 17 Jan 2006 21:43:10 +0000]
[PATCH] sky2: receive buffer alignment

Need to make sure that sky2 receive buffers are 64 bit
aligned. Also, don't need to start off with GFP_ATOMIC
on initial setup.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] e100: e100 whitespace fixes
Jesse Brandeburg [Tue, 17 Jan 2006 23:01:10 +0000]
[PATCH] e100: e100 whitespace fixes

e100: e100 whitespace fixes

These are whitespace only fixes.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] e100: Handle the return values from pci_* functions
Jesse Brandeburg [Tue, 17 Jan 2006 23:01:08 +0000]
[PATCH] e100: Handle the return values from pci_* functions

e100: Handle the return values from pci_* functions

This is to resolve warnings during compile time.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] e100: Fix TX hang and RMCP Ping issue (due to a microcode loading issue)
Jesse Brandeburg [Tue, 17 Jan 2006 23:01:06 +0000]
[PATCH] e100: Fix TX hang and RMCP Ping issue (due to a microcode loading issue)

e100: Fix TX hang and RMCP Ping issue (due to a microcode loading issue)

Set the end of list bit to cause the hardware's transmit state machine to
work correctly and not prevent management (BMC) traffic.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[SOUND]: sparc/cs4231: Fix some typos which wrecked the build.
David S. Miller [Tue, 17 Jan 2006 23:55:58 +0000]
[SOUND]: sparc/cs4231: Fix some typos which wrecked the build.

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

15 years ago[SPARC]: Fix sbusfb build.
David S. Miller [Tue, 17 Jan 2006 23:53:11 +0000]
[SPARC]: Fix sbusfb build.

sbusfb_compat_ioctl() needs to return int, not long, as that
is what the fb_ops->fb_compat_ioctl method prototype wants.

Need to git rid of the "struct file *file" first argument to
fbiogetputcmap() and fbiogscursor() to match calls done in
sbusfb_compat_ioctl().

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

15 years ago[TIPC] Avoid polluting the global namespace
Per Liden [Tue, 17 Jan 2006 23:38:21 +0000]
[TIPC] Avoid polluting the global namespace

This patch adds a tipc_ prefix to all externally visible symbols.

Signed-off-by: Per Liden <per.liden@ericsson.com>

15 years ago[TIPC] Group protocols with sub-options in Kconfig
Per Liden [Mon, 16 Jan 2006 15:39:13 +0000]
[TIPC] Group protocols with sub-options in Kconfig

This is just a cosmetic change that moves the TIPC configuration
entry next to the other protocols that also have sub-options.
Makes the the networking options menu look a bit better.

Signed-off-by: Per Liden <per.liden@ericsson.com>

15 years ago[TIPC] Add help text for TIPC configuration option
Per Liden [Mon, 16 Jan 2006 15:32:18 +0000]
[TIPC] Add help text for TIPC configuration option

Signed-off-by: Per Liden <per.liden@ericsson.com>

15 years ago[TIPC] Remove unused #includes
Per Liden [Mon, 16 Jan 2006 11:42:35 +0000]
[TIPC] Remove unused #includes

Signed-off-by: Per Liden <per.liden@ericsson.com>

15 years ago[TIPC] Move ethernet protocol id to linux/if_ether.h
Per Liden [Mon, 16 Jan 2006 10:42:12 +0000]
[TIPC] Move ethernet protocol id to linux/if_ether.h

Signed-off-by: Per Liden <per.liden@ericsson.com>

15 years ago[TIPC] Provide real email addresses in MAINTAINERS
Per Liden [Sat, 14 Jan 2006 11:42:21 +0000]
[TIPC] Provide real email addresses in MAINTAINERS

Signed-off-by: Per Liden <per.liden@ericsson.com>

15 years ago[TIPC] Updated link priority macros
Per Liden [Fri, 13 Jan 2006 21:22:22 +0000]
[TIPC] Updated link priority macros

Added macros for min/default/max link priority in tipc_config.h.
Also renamed TIPC_NUM_LINK_PRI to TIPC_MEDIA_LINK_PRI since that
is a more accurate description of what it is used for.

Signed-off-by: Per Liden <per.liden@ericsson.com>

15 years ago[TIPC] Minor changes to #includes
Jon Maloy [Fri, 13 Jan 2006 10:45:44 +0000]
[TIPC] Minor changes to #includes

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>

15 years ago[SPARC]: change if() BUG(); to BUG_ON in iommu.c
Eric Sesterhenn [Tue, 17 Jan 2006 23:36:05 +0000]
[SPARC]: change if() BUG(); to BUG_ON in iommu.c

this patch changes if() BUG(); constructs
in iommu.c to BUG_ON(); so it gets save
to define BUG() and BUG_ON() to nullstatements.

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years agoARM: OMAP: 4/4 Fix clock framework to use clk_enable/disable misc
Tony Lindgren [Tue, 17 Jan 2006 23:33:51 +0000]
ARM: OMAP: 4/4 Fix clock framework to use clk_enable/disable misc

This patch fixes OMAP clock framework to use clk_enable/disable
instead of clk_use/unuse as specified in include/linux/clk.h.

Signed-off-by: Tony Lindgren <tony@atomide.com>

15 years agoARM: OMAP: 3/4 Fix clock framework to use clk_enable/disable for omap2
Tony Lindgren [Tue, 17 Jan 2006 23:31:18 +0000]
ARM: OMAP: 3/4 Fix clock framework to use clk_enable/disable for omap2

This patch fixes OMAP clock framework to use clk_enable/disable
instead of clk_use/unuse as specified in include/linux/clk.h.

Signed-off-by: Tony Lindgren <tony@atomide.com>

15 years agoARM: OMAP: 2/4 Fix clock framework to use clk_enable/disable for omap1
Tony Lindgren [Tue, 17 Jan 2006 23:30:42 +0000]
ARM: OMAP: 2/4 Fix clock framework to use clk_enable/disable for omap1

This patch fixes OMAP clock framework to use clk_enable/disable
instead of clk_use/unuse as specified in include/linux/clk.h.

Signed-off-by: Tony Lindgren <tony@atomide.com>

15 years agoARM: OMAP: 1/4 Fix clock framework to use clk_enable/disable
Tony Lindgren [Tue, 17 Jan 2006 23:27:09 +0000]
ARM: OMAP: 1/4 Fix clock framework to use clk_enable/disable

This patch fixes OMAP clock framework to use clk_enable/disable
instead of clk_use/unuse as specified in include/linux/clk.h.

Instances of clk_use/unuse are renamed to clk_enable/disable,
and references clk_use/unuse are removed.

Signed-off-by: Tony Lindgren <tony@atomide.com>

15 years ago[SPARC64]: Eliminate race condition reading Hummingbird STICK register
Richard Mortimer [Tue, 17 Jan 2006 23:21:01 +0000]
[SPARC64]: Eliminate race condition reading Hummingbird STICK register

Ensure a consistent value is read from the STICK register by ensuring
that both high and low are read without high changing due to a roll
over of the low register.

Various Debian/SPARC users (myself include) have noticed problems with
Hummingbird based systems. The symptoms are that the system time is
seen to jump forward 3 days, 6 hours, 11 minutes give or take a few
seconds. In many cases the system then hangs some time afterwards.

I've spotted a race condition in the code to read the STICK register.
I could not work out why 3d, 6h, 11m is important but guess that it is
due to the 2^32 jump of STICK (forwards on one read and then the next
read will seem to be backwards) during a timer interrupt. I'm guessing
that a change of -2^32 will get converted to a large unsigned
increment after the arithmetic manipulation between STICK,
nanoseconds, jiffies etc.

I did a test where I modified __hbird_read_stick to artificially
inject rollover faults forcefully every few seconds. With this I saw
the clock jump over 6 times in 12 hours compared to once every month
or so.

Signed-off-by: Richard Mortimer <richm@oldelvet.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[NET]: Use is_zero_ether_addr() in net/core/netpoll.c
Kris Katterjohn [Tue, 17 Jan 2006 23:15:38 +0000]
[NET]: Use is_zero_ether_addr() in net/core/netpoll.c

This replaces a memcmp() with is_zero_ether_addr().

Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[CASSINI]: Fix printk warning.
Andrew Morton [Tue, 17 Jan 2006 23:14:49 +0000]
[CASSINI]: Fix printk warning.

drivers/net/cassini.c:1930: warning: long unsigned int format, different type arg (arg 4)

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[PKTGEN]: Replacing with (compare|is_zero)_ether_addr() and ETH_ALEN
Kris Katterjohn [Tue, 17 Jan 2006 21:04:57 +0000]
[PKTGEN]: Replacing with (compare|is_zero)_ether_addr() and ETH_ALEN

This replaces some tests with is_zero_ether_addr(), memcmp(one, two,
6) with compare_ether_addr(one, two), and 6 with ETH_ALEN where
appropriate.

Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[NET]: "signed long" -> "long"
Kris Katterjohn [Tue, 17 Jan 2006 21:03:54 +0000]
[NET]: "signed long" -> "long"

Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

15 years ago[EBTABLES]: Handle SCTP/DCCP in ebt_{ip,log}
Patrick McHardy [Tue, 17 Jan 2006 21:01:31 +0000]
[EBTABLES]: Handle SCTP/DCCP in ebt_{ip,log}

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

15 years ago[PKT_SCHED]: Handle SCTP/DCCP in sfq_hash
Patrick McHardy [Tue, 17 Jan 2006 21:01:06 +0000]
[PKT_SCHED]: Handle SCTP/DCCP in sfq_hash

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

15 years ago[PATCH] libata: add a function to decide if we need iordy
Alan Cox [Mon, 9 Jan 2006 17:18:14 +0000]
[PATCH] libata: add a function to decide if we need iordy

This ought to be simple but for PIO2 we have to poke around the drive
data to get it 100% correct.

Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[PATCH] libata: Pre UDMA EIDE PIO mode selection
Alan Cox [Mon, 9 Jan 2006 17:14:40 +0000]
[PATCH] libata: Pre UDMA EIDE PIO mode selection

I misread the spec when doing the original. I've tested the corrected
version with pre UDMA drives and it now picks the right modes. This is a
specific bug fix rather than an update or new feature item.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

15 years ago[libata] sata_promise: add pci id
Yusuf Iskenderoglu [Tue, 17 Jan 2006 13:06:21 +0000]
[libata] sata_promise: add pci id

15 years agoairo: Off-by-one channel fix
Javier Achirica [Tue, 17 Jan 2006 13:01:01 +0000]
airo: Off-by-one channel fix

15 years ago[libata] sata_svw: add pci id
Oliver Weihe [Tue, 17 Jan 2006 12:58:42 +0000]
[libata] sata_svw: add pci id