]> pilppa.com Git - linux-2.6-omap-h63xx.git/log
linux-2.6-omap-h63xx.git
18 years ago[PATCH] uml ubd code: fix a bit of whitespace
Paolo 'Blaisorblade' Giarrusso [Thu, 19 Jan 2006 01:43:01 +0000 (17:43 -0800)]
[PATCH] uml ubd code: fix a bit of whitespace

Correct a bit of whitespace problems while working here.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: allow again to move backing file and to override saved location
Paolo 'Blaisorblade' Giarrusso [Thu, 19 Jan 2006 01:43:00 +0000 (17:43 -0800)]
[PATCH] uml: allow again to move backing file and to override saved location

When the user specifies both a COW file and its backing file, if the previous
backing file is not found, currently UML tries again to use it and fails.

This can be corrected by changing same_backing_files() return value in that
case, so that the caller will try to change the COW file to point to the new
location, as already done in other cases.

Additionally, given the change in the meaning of the func, change its name,
invert its return value, so all values are inverted except when
stat(from_cow,&buf2) fails.  And add some comments and two minor bugfixes -
remove a fd leak (return err rather than goto out) and a repeated check.

Tested well.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: arch Kconfig menu cleanups
Paolo 'Blaisorblade' Giarrusso [Thu, 19 Jan 2006 01:42:59 +0000 (17:42 -0800)]
[PATCH] uml: arch Kconfig menu cleanups

*) mark as "EXPERIMENTAL" various items that either aren't very stable or
   that are actively crashing the setup of users which don't really need them
   (i.e.  HIGHMEM and 3-level pagetables on x86 - nobody needs either,
   everybody reports "I'm using it and getting trouble").

*) move net/Kconfig near to the rest of network configurations, and
   drivers/block/Kconfig near "Block layer" submenu.

*) it's useless and doesn't work well to force NETDEVICES on and to disable
   the prompt like it's done.  Better remove the attempt, and change that to a
   simple "default y if UML".

*) drop the warning about "report problems about HPPFS" - it's redundant
   anyway, as that's the usual procedure, and HPPFS users are especially
   technical (i.e.  they know reporting bugs is _good_).

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: avoid malloc to sleep in atomic sections
Paolo 'Blaisorblade' Giarrusso [Thu, 19 Jan 2006 01:42:58 +0000 (17:42 -0800)]
[PATCH] uml: avoid malloc to sleep in atomic sections

Ugly trick to help make malloc not sleeping - we can't do anything else.  But
this is not yet optimal, since spinlock don't trigger in_atomic() when
preemption is disabled.

Also, even if ugly, this was already used in one place, and was even more
bogus.  Fix it.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: sigio code - reduce spinlock hold time
Paolo 'Blaisorblade' Giarrusso [Thu, 19 Jan 2006 01:42:57 +0000 (17:42 -0800)]
[PATCH] uml: sigio code - reduce spinlock hold time

In a previous patch I shifted an allocation to being atomic.

In this patch, a better but more intrusive solution is implemented, i.e.  hold
the lock only when really needing it, especially not over pipe operations, nor
over the culprit allocation.

Additionally, while at it, add a missing kfree in the failure path, and make
sure that if we fail in forking, write_sigio_pid is -1 and not, say, -ENOMEM.

And fix whitespace, at least for things I was touching anyway.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: fix spinlock recursion and sleep-inside-spinlock in error path
Paolo 'Blaisorblade' Giarrusso [Thu, 19 Jan 2006 01:42:56 +0000 (17:42 -0800)]
[PATCH] uml: fix spinlock recursion and sleep-inside-spinlock in error path

In this error path, when the interface has had a problem, we call dev_close(),
which is disallowed for two reasons:

*) takes again the UML internal spinlock, inside the ->stop method of this
   device
*) can be called in process context only, while we're in interrupt context.

I've also thought that calling dev_close() may be a wrong policy to follow,
but it's not up to me to decide that.

However, we may end up with multiple dev_close() queued on the same device.
But the initial test for (dev->flags & IFF_UP) makes this harmless, though -
and dev_close() is supposed to care about races with itself.  So there's no
harm in delaying the shutdown, IMHO.

Something to mark the interface as "going to shutdown" would be appreciated,
but dev_deactivate has the same problems as dev_close(), so we can't use it
either.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: networking - clear transport-specific structure
Paolo 'Blaisorblade' Giarrusso [Thu, 19 Jan 2006 01:42:55 +0000 (17:42 -0800)]
[PATCH] uml: networking - clear transport-specific structure

Pre-clear transport-specific private structure before passing it down.

In fact, I just got a slab corruption and kernel panic on exit because kfree()
was called on a pointer which probably was never allocated, BUT hadn't been
set to NULL by the driver.

As the code is full of such errors, I've decided for now to go the safe way
(we're talking about drivers), and to do the simple thing.  I'm also starting
to fix drivers, and already sent a patch for the daemon transport.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: make daemon transport behave properly
Paolo 'Blaisorblade' Giarrusso [Thu, 19 Jan 2006 01:42:53 +0000 (17:42 -0800)]
[PATCH] uml: make daemon transport behave properly

Avoid uninitialized data in the daemon_data structure.  I used this transport
before doing proper setup before-hand, and I got some very nice SLAB
corruption due to freeing crap pointers.  So just make sure to clear
everything when appropriate.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: remove leftover from patch revertal
Paolo 'Blaisorblade' Giarrusso [Thu, 19 Jan 2006 01:42:52 +0000 (17:42 -0800)]
[PATCH] uml: remove leftover from patch revertal

I added this line to share this file with UML, but now it's no longer
shared so remove this useless leftover.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: TT mode softint fixes
Bodo Stroesser [Thu, 19 Jan 2006 01:42:51 +0000 (17:42 -0800)]
[PATCH] uml: TT mode softint fixes

Some fixes to make softints work in tt mode.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: use setjmp/longjmp instead of sigsetjmp/siglongjmp
Jeff Dike [Thu, 19 Jan 2006 01:42:50 +0000 (17:42 -0800)]
[PATCH] uml: use setjmp/longjmp instead of sigsetjmp/siglongjmp

Now that we are doing soft interrupts, there's no point in using sigsetjmp and
siglongjmp.  Using setjmp and longjmp saves a sigprocmask on every jump.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: implement soft interrupts
Jeff Dike [Thu, 19 Jan 2006 01:42:49 +0000 (17:42 -0800)]
[PATCH] uml: implement soft interrupts

This patch implements soft interrupts.  Interrupt enabling and disabling no
longer map to sigprocmask.  Rather, a flag is set indicating whether
interrupts may be handled.  If a signal comes in and interrupts are marked as
OK, then it is handled normally.  If interrupts are marked as off, then the
signal handler simply returns after noting that a signal needs handling.  When
interrupts are enabled later on, this pending signals flag is checked, and the
IRQ handlers are called at that point.

The point of this is to reduce the cost of local_irq_save et al, since they
are very much more common than the signals that they are enabling and
disabling.  Soft interrupts produce a speed-up of ~25% on a kernel build.

Subtleties -

    UML uses sigsetjmp/siglongjmp to switch contexts.  sigsetjmp has been
    wrapped in a save_flags-like macro which remembers the interrupt state at
    setjmp time, and restores it when it is longjmp-ed back to.

    The enable_signals function has to loop because the IRQ handler
    disables interrupts before returning.  enable_signals has to return with
    signals enabled, and signals may come in between the disabling and the
    return to enable_signals.  So, it loops for as long as there are pending
    signals, ensuring that signals are enabled when it finally returns, and
    that there are no pending signals that need to be dealt with.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: eliminate some globals
Jeff Dike [Thu, 19 Jan 2006 01:42:48 +0000 (17:42 -0800)]
[PATCH] uml: eliminate some globals

Stop using global variables to hold the file descriptor and offset used to map
the skas0 stubs.  Instead, calculate them using the page physical addresses.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: move libc-dependent skas process handling
Gennady Sharapov [Thu, 19 Jan 2006 01:42:46 +0000 (17:42 -0800)]
[PATCH] uml: move libc-dependent skas process handling

The serial UML OS-abstraction layer patch (um/kernel/skas dir).

This moves all systemcalls from skas/process.c file under os-Linux dir and
join skas/process.c and skas/process_kern.c files.

Signed-off-by: Gennady Sharapov <gennady.v.sharapov@intel.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: move libc-dependent skas memory mapping code
Gennady Sharapov [Thu, 19 Jan 2006 01:42:45 +0000 (17:42 -0800)]
[PATCH] uml: move libc-dependent skas memory mapping code

The serial UML OS-abstraction layer patch (um/kernel/skas dir).

This moves all systemcalls from skas/mem_user.c file under os-Linux dir and
join skas/mem_user.c and skas/mem.c files.

Signed-off-by: Gennady Sharapov <gennady.v.sharapov@intel.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: move headers to arch/um/include
Gennady Sharapov [Thu, 19 Jan 2006 01:42:44 +0000 (17:42 -0800)]
[PATCH] uml: move headers to arch/um/include

The serial UML OS-abstraction layer patch (um/kernel dir).

This moves skas headers to arch/um/include.

Signed-off-by: Gennady Sharapov <Gennady.V.Sharapov@intel.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: change interface to boot_timer_handler
Bodo Stroesser [Thu, 19 Jan 2006 01:42:43 +0000 (17:42 -0800)]
[PATCH] uml: change interface to boot_timer_handler

Current implementation of boot_timer_handler isn't usable for s390.  So I
changed its name to do_boot_timer_handler, taking (struct sigcontext *)sc as
argument.  do_boot_timer_handler is called from new boot_timer_handler() in
arch/um/os-Linux/signal.c, which uses the same mechanisms as other signal
handler to find out sigcontext pointer.

Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: move libc-dependent time code
Gennady Sharapov [Thu, 19 Jan 2006 01:42:42 +0000 (17:42 -0800)]
[PATCH] uml: move libc-dependent time code

The serial UML OS-abstraction layer patch (um/kernel dir).

This moves all systemcalls from time.c file under os-Linux dir and joins
time.c and tine_kernel.c files

Signed-off-by: Gennady Sharapov <Gennady.V.Sharapov@intel.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: move libc-dependent utility procedures
Gennady Sharapov [Thu, 19 Jan 2006 01:42:41 +0000 (17:42 -0800)]
[PATCH] uml: move libc-dependent utility procedures

The serial UML OS-abstraction layer patch (um/kernel dir).

This moves all systemcalls from user_util.c file under os-Linux dir

Signed-off-by: Gennady Sharapov <Gennady.V.Sharapov@intel.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: move LDT creation
Bodo Stroesser [Thu, 19 Jan 2006 01:42:39 +0000 (17:42 -0800)]
[PATCH] uml: move LDT creation

s390 doesn't have a LDT.  So MM_COPY_SEGMENTS will not be supported on s390.

The only user of MM_COPY_SEGMENTS is new_mm(), but that's no longer useful, as
arch/sys-i386/ldt.c defines init_new_ldt(), which is called immediately after
new_mm().  So we should copy host's LDT in init_new_ldt(), if /proc/mm is
available, to have this subarch specific call in subarch code.

Signed-off-by: Bodo Stroesser <bstroesser@fujitsu-siemens.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] uml: add __raw_writel definition
Jeff Dike [Thu, 19 Jan 2006 01:42:38 +0000 (17:42 -0800)]
[PATCH] uml: add __raw_writel definition

Add implementations of the write* and __raw_write* functions.  __raw_writel is
needed by lib/iocopy.c, which shouldn't be used in UML, but which is
unconditionally linked in anyway.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] mm: optimize numa policy handling in slab allocator
Christoph Lameter [Thu, 19 Jan 2006 01:42:37 +0000 (17:42 -0800)]
[PATCH] mm: optimize numa policy handling in slab allocator

Move the interrupt check from slab_node into ___cache_alloc and adds an
"unlikely()" to avoid pipeline stalls on some architectures.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] NUMA policies in the slab allocator V2
Christoph Lameter [Thu, 19 Jan 2006 01:42:36 +0000 (17:42 -0800)]
[PATCH] NUMA policies in the slab allocator V2

This patch fixes a regression in 2.6.14 against 2.6.13 that causes an
imbalance in memory allocation during bootup.

The slab allocator in 2.6.13 is not numa aware and simply calls
alloc_pages().  This means that memory policies may control the behavior of
alloc_pages().  During bootup the memory policy is set to MPOL_INTERLEAVE
resulting in the spreading out of allocations during bootup over all
available nodes.  The slab allocator in 2.6.13 has only a single list of
slab pages.  As a result the per cpu slab cache and the spinlock controlled
page lists may contain slab entries from off node memory.  The slab
allocator in 2.6.13 makes no effort to discern the locality of an entry on
its lists.

The NUMA aware slab allocator in 2.6.14 controls locality of the slab pages
explicitly by calling alloc_pages_node().  The NUMA slab allocator manages
slab entries by having lists of available slab pages for each node.  The
per cpu slab cache can only contain slab entries associated with the node
local to the processor.  This guarantees that the default allocation mode
of the slab allocator always assigns local memory if available.

Setting MPOL_INTERLEAVE as a default policy during bootup has no effect
anymore.  In 2.6.14 all node unspecific slab allocations are performed on
the boot processor.  This means that most of key data structures are
allocated on one node.  Most processors will have to refer to these
structures making the boot node a potential bottleneck.  This may reduce
performance and cause unnecessary memory pressure on the boot node.

This patch implements NUMA policies in the slab layer.  There is the need
of explicit application of NUMA memory policies by the slab allcator itself
since the NUMA slab allocator does no longer let the page_allocator control
locality.

The check for policies is made directly at the beginning of __cache_alloc
using current->mempolicy.  The memory policy is already frequently checked
by the page allocator (alloc_page_vma() and alloc_page_current()).  So it
is highly likely that the cacheline is present.  For MPOL_INTERLEAVE
kmalloc() will spread out each request to one node after another so that an
equal distribution of allocations can be obtained during bootup.

It is not possible to push the policy check to lower layers of the NUMA
slab allocator since the per cpu caches are now only containing slab
entries from the current node.  If the policy says that the local node is
not to be preferred or forbidden then there is no point in checking the
slab cache or local list of slab pages.  The allocation better be directed
immediately to the lists containing slab entries for the allowed set of
nodes.

This way of applying policy also fixes another strange behavior in 2.6.13.
alloc_pages() is controlled by the memory allocation policy of the current
process.  It could therefore be that one process is running with
MPOL_INTERLEAVE and would f.e.  obtain a new page following that policy
since no slab entries are in the lists anymore.  A page can typically be
used for multiple slab entries but lets say that the current process is
only using one.  The other entries are then added to the slab lists.  These
are now non local entries in the slab lists despite of the possible
availability of local pages that would provide faster access and increase
the performance of the application.

Another process without MPOL_INTERLEAVE may now run and expect a local slab
entry from kmalloc().  However, there are still these free slab entries
from the off node page obtained from the other process via MPOL_INTERLEAVE
in the cache.  The process will then get an off node slab entry although
other slab entries may be available that are local to that process.  This
means that the policy if one process may contaminate the locality of the
slab caches for other processes.

This patch in effect insures that a per process policy is followed for the
allocation of slab entries and that there cannot be a memory policy
influence from one process to another.  A process with default policy will
always get a local slab entry if one is available.  And the process using
memory policies will get its memory arranged as requested.  Off-node slab
allocation will require the use of spinlocks and will make the use of per
cpu caches not possible.  A process using memory policies to redirect
allocations offnode will have to cope with additional lock overhead in
addition to the latency added by the need to access a remote slab entry.

Changes V1->V2
- Remove #ifdef CONFIG_NUMA by moving forward declaration into
  prior #ifdef CONFIG_NUMA section.

- Give the function determining the node number to use a saner
  name.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
18 years ago[PATCH] sem2mutex: mm/slab.c
Ingo Molnar [Thu, 19 Jan 2006 01:42:33 +0000 (17:42 -0800)]
[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>
18 years ago[PATCH] Zone reclaim: proc override
Christoph Lameter [Thu, 19 Jan 2006 01:42:32 +0000 (17:42 -0800)]
[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>
18 years ago[PATCH] Zone reclaim: Reclaim logic
Christoph Lameter [Thu, 19 Jan 2006 01:42:31 +0000 (17:42 -0800)]
[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>
18 years ago[PATCH] Zone reclaim: resurrect may_swap
Christoph Lameter [Thu, 19 Jan 2006 01:42:30 +0000 (17:42 -0800)]
[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>
18 years ago[PATCH] Simplify migrate_page_add
Christoph Lameter [Thu, 19 Jan 2006 01:42:29 +0000 (17:42 -0800)]
[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>
18 years ago[PATCH] mm: migration page refcounting fix
Nick Piggin [Thu, 19 Jan 2006 01:42:27 +0000 (17:42 -0800)]
[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>
18 years ago[PATCH] mm: dirty_exceeded speedup
Andrew Morton [Thu, 19 Jan 2006 01:42:26 +0000 (17:42 -0800)]
[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>
18 years ago[PATCH] Prevent trident driver from grabbing pcnet32 hardware
Jon Mason [Thu, 19 Jan 2006 01:42:25 +0000 (17:42 -0800)]
[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>
18 years ago[PATCH] synclink_gt fix size of register value storage
Paul Fulghum [Thu, 19 Jan 2006 01:42:24 +0000 (17:42 -0800)]
[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>
18 years ago[PATCH] scsi_transport_spi build fix
Andrew Morton [Thu, 19 Jan 2006 01:42:22 +0000 (17:42 -0800)]
[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>
18 years ago[PATCH] x86_64: Fix MCE exception stack for boot CPU
Jan Beulich [Thu, 19 Jan 2006 01:42:21 +0000 (17:42 -0800)]
[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>
18 years ago[PATCH] jbd: remove_transaction fix
Jan Kara [Thu, 19 Jan 2006 01:42:20 +0000 (17:42 -0800)]
[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>
18 years ago[PATCH] jbd: log_do_checkpoint fix
Jan Kara [Thu, 19 Jan 2006 01:42:19 +0000 (17:42 -0800)]
[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>
18 years agoMerge master.kernel.org:/home/rmk/linux-2.6-serial
Linus Torvalds [Wed, 18 Jan 2006 23:19:40 +0000 (15:19 -0800)]
Merge master.kernel.org:/home/rmk/linux-2.6-serial

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

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

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

18 years ago[SPARC64]: Fix build with CONFIG_COMPAT disabled.
David S. Miller [Wed, 18 Jan 2006 22:58:05 +0000 (14:58 -0800)]
[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>
18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream
Russell King [Wed, 18 Jan 2006 22:56:29 +0000 (22:56 +0000)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream

18 years ago[SPARC64]: Serial Console for E250 Patch
Eddie C. Dost [Wed, 18 Jan 2006 22:54:31 +0000 (14:54 -0800)]
[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>
18 years ago[MAINTAINERS]: add entry for wireless networking
John W. Linville [Wed, 18 Jan 2006 22:52:48 +0000 (14:52 -0800)]
[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>
18 years ago[MAINTAINERS]: correct location for net-2.6.git
John W. Linville [Wed, 18 Jan 2006 22:52:18 +0000 (14:52 -0800)]
[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>
18 years ago[ARM] 3281/1: ixp4xx: export ixp4xx_exp_bus_size for modules
David Vrabel [Wed, 18 Jan 2006 22:46:43 +0000 (22:46 +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>
18 years ago[ARM] 3272/1: fix kernel decompressor crash
Nicolas Pitre [Wed, 18 Jan 2006 22:38:51 +0000 (22:38 +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>
18 years ago[ARM] 3271/1: ARM EABI: fix calling of cmpxchg syscall emulation
Nicolas Pitre [Wed, 18 Jan 2006 22:38:49 +0000 (22:38 +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>
18 years ago[ARM] 3270/1: ARM EABI: fix sigreturn and rt_sigreturn
Nicolas Pitre [Wed, 18 Jan 2006 22:38:47 +0000 (22:38 +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>
18 years ago[ARM] 3268/1: AT91RM9200 serial update for 2.6.15-git12
Andrew Victor [Wed, 18 Jan 2006 22:38:46 +0000 (22:38 +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>
18 years ago[ARM] 3267/1: PXA27x SSP controller register defines
David Vrabel [Wed, 18 Jan 2006 22:38:44 +0000 (22:38 +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>
18 years agoMerge git://tipc.cslab.ericsson.net/pub/git/tipc
David S. Miller [Wed, 18 Jan 2006 22:23:54 +0000 (14:23 -0800)]
Merge git://tipc.cslab.ericsson.net/pub/git/tipc

18 years ago[IPV4]: Fix multiple bugs in IGMPv3
David L Stevens [Wed, 18 Jan 2006 22:20:56 +0000 (14:20 -0800)]
[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>
18 years ago[PKTGEN]: Respect hard_header_len of device.
David S. Miller [Wed, 18 Jan 2006 22:19:10 +0000 (14:19 -0800)]
[PKTGEN]: Respect hard_header_len of device.

Don't assume 16.

Found by Ben Greear.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[IRDA]: maintainer status
Stephen Hemminger [Wed, 18 Jan 2006 22:06:59 +0000 (14:06 -0800)]
[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>
18 years ago[CASSINI]: dont touch page_count
Nick Piggin [Wed, 18 Jan 2006 22:05:16 +0000 (14:05 -0800)]
[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>
18 years ago[SPARC64]: Update defconfig.
David S. Miller [Wed, 18 Jan 2006 21:41:36 +0000 (13:41 -0800)]
[SPARC64]: Update defconfig.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[PATCH] e1000: fix compile warning
Jesse Brandeburg [Wed, 18 Jan 2006 21:01:45 +0000 (13:01 -0800)]
[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>
18 years ago[PATCH] e1000: fix receive breakage
Jesse Brandeburg [Wed, 18 Jan 2006 21:01:43 +0000 (13:01 -0800)]
[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>
18 years ago[PATCH] e1000: Added driver comments
Jesse Brandeburg [Wed, 18 Jan 2006 21:01:41 +0000 (13:01 -0800)]
[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>
18 years ago[PATCH] e1000: Fix whitespace
Jesse Brandeburg [Wed, 18 Jan 2006 21:01:39 +0000 (13:01 -0800)]
[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>
18 years ago[PATCH] e1000: Added functions declarations
Jesse Brandeburg [Wed, 18 Jan 2006 21:01:37 +0000 (13:01 -0800)]
[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>
18 years ago[PATCH] e1000: Added functions to save and restore config
Jesse Brandeburg [Wed, 18 Jan 2006 21:01:34 +0000 (13:01 -0800)]
[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>
18 years ago[PATCH] e1000: Added RX buffer enhancements
Jesse Brandeburg [Wed, 18 Jan 2006 21:01:32 +0000 (13:01 -0800)]
[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>
18 years ago[PATCH] e1000: Added disable packet split capability
Jesse Brandeburg [Wed, 18 Jan 2006 21:01:30 +0000 (13:01 -0800)]
[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>
18 years ago[SERIAL] Add 8250 support for Decision Computer International Co. PCCOM2
Alon Bar-Lev [Wed, 18 Jan 2006 11:47:33 +0000 (11:47 +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>
18 years ago[SERIAL] Fix serial8250 driver initialisation ordering
Russell King [Wed, 18 Jan 2006 09:54:29 +0000 (09:54 +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>
18 years ago[IPV4]: RT_CACHE_STAT_INC() warning fix
Andrew Morton [Wed, 18 Jan 2006 05:58:01 +0000 (21:58 -0800)]
[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>
18 years agoMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
Linus Torvalds [Wed, 18 Jan 2006 03:48:07 +0000 (19:48 -0800)]
Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

18 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 (19:47 -0800)]
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

18 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 (19:46 -0800)]
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

18 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 (13:38 +1100)]
[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>
18 years agoMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Wed, 18 Jan 2006 01:32:22 +0000 (17:32 -0800)]
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

18 years ago[PATCH] Fix sparse parse error in lppaca.h
Bryan O'Sullivan [Wed, 18 Jan 2006 01:00:05 +0000 (17:00 -0800)]
[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>
18 years ago[PATCH] skge: fix dma mask setup.
Stephen Hemminger [Fri, 6 Jan 2006 00:26:05 +0000 (16:26 -0800)]
[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>
18 years ago[PATCH] libata: Code for the IRQ mask flag
Alan Cox [Tue, 17 Jan 2006 20:53:50 +0000 (20:53 +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>
18 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 (20:51 +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>
18 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 (20:50 +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>
18 years ago[PATCH] Intel ICH8 SATA: add PCI device IDs
Jason Gaston [Tue, 17 Jan 2006 20:28:48 +0000 (12:28 -0800)]
[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>
18 years ago[PATCH] Fix warning with b44.c on 64bit boxes
Alan Cox [Tue, 17 Jan 2006 17:53:56 +0000 (17:53 +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>
18 years ago[PATCH] sky2: 0.13 version
Stephen Hemminger [Tue, 17 Jan 2006 21:43:21 +0000 (13:43 -0800)]
[PATCH] sky2: 0.13 version

Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] sky2: more conservative transmit locking
Stephen Hemminger [Tue, 17 Jan 2006 21:43:20 +0000 (13:43 -0800)]
[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>
18 years ago[PATCH] sky2: don't inline so much
Stephen Hemminger [Tue, 17 Jan 2006 21:43:19 +0000 (13:43 -0800)]
[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>
18 years ago[PATCH] sky2: use kzalloc
Stephen Hemminger [Tue, 17 Jan 2006 21:43:18 +0000 (13:43 -0800)]
[PATCH] sky2: use kzalloc

Can use kzalloc here.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] sky2: ratelimit error messages
Stephen Hemminger [Tue, 17 Jan 2006 21:43:17 +0000 (13:43 -0800)]
[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>
18 years ago[PATCH] sky2: optimize for 32 bit dma
Stephen Hemminger [Tue, 17 Jan 2006 21:43:16 +0000 (13:43 -0800)]
[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>
18 years ago[PATCH] sky2: don't bother clearing status ring elements
Stephen Hemminger [Tue, 17 Jan 2006 21:43:15 +0000 (13:43 -0800)]
[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>
18 years ago[PATCH] sky2: write barrier's
Stephen Hemminger [Tue, 17 Jan 2006 21:43:14 +0000 (13:43 -0800)]
[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>
18 years ago[PATCH] sky2: fix ram buffer for Yukon FE rev 2
Stephen Hemminger [Tue, 17 Jan 2006 21:43:13 +0000 (13:43 -0800)]
[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>
18 years ago[PATCH] sky2: version 0.12
Stephen Hemminger [Tue, 17 Jan 2006 21:43:12 +0000 (13:43 -0800)]
[PATCH] sky2: version 0.12

Version update.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
18 years ago[PATCH] sky2: call pci_set_consistent_dma_mask
Stephen Hemminger [Tue, 17 Jan 2006 21:43:11 +0000 (13:43 -0800)]
[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>
18 years ago[PATCH] sky2: receive buffer alignment
Stephen Hemminger [Tue, 17 Jan 2006 21:43:10 +0000 (13:43 -0800)]
[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>
18 years ago[PATCH] e100: e100 whitespace fixes
Jesse Brandeburg [Tue, 17 Jan 2006 23:01:10 +0000 (15:01 -0800)]
[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>
18 years ago[PATCH] e100: Handle the return values from pci_* functions
Jesse Brandeburg [Tue, 17 Jan 2006 23:01:08 +0000 (15:01 -0800)]
[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>
18 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 (15:01 -0800)]
[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>
18 years ago[SOUND]: sparc/cs4231: Fix some typos which wrecked the build.
David S. Miller [Tue, 17 Jan 2006 23:55:58 +0000 (15:55 -0800)]
[SOUND]: sparc/cs4231: Fix some typos which wrecked the build.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 years ago[SPARC]: Fix sbusfb build.
David S. Miller [Tue, 17 Jan 2006 23:53:11 +0000 (15:53 -0800)]
[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>
18 years ago[TIPC] Avoid polluting the global namespace
Per Liden [Tue, 17 Jan 2006 23:38:21 +0000 (00:38 +0100)]
[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>
18 years ago[TIPC] Group protocols with sub-options in Kconfig
Per Liden [Mon, 16 Jan 2006 15:39:13 +0000 (16:39 +0100)]
[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>