1. 29 Dec, 2003 40 commits
    • David S. Miller's avatar
      Merge nuts.ninka.net:/disk1/davem/BK/sparcwork-2.6 · 1979c599
      David S. Miller authored
      into nuts.ninka.net:/disk1/davem/BK/sparc-2.6
      1979c599
    • Linus Torvalds's avatar
      Merge bk://gkernel.bkbits.net/net-drivers-2.5 · e36a9e24
      Linus Torvalds authored
      into home.osdl.org:/home/torvalds/v2.5/linux
      e36a9e24
    • Jeff Garzik's avatar
      e40cca9e
    • Andrew Morton's avatar
    • Daniele Venzano's avatar
      [netdrvr sis900] add suspend/resume support · 4a493b70
      Daniele Venzano authored
      The attached patch adds support for suspend/resume to the sis900 driver.
      With this patch on resume the NIC is fully configured and operational,
      before a module reload was needed because of the complete lack of
      suspend/resume callbacks.
      
      I added two functions, sis900_suspend and sis900_resume, with their
      pointers in struct pci_driver. A vector of 16 u32 was then needed to the
      to keep PCI data during suspend. I added it in struct sis900_private.
      I updated the revision number to reflect my changes. 
      Looking at the code I also killed three typos.
      
      The patch doesn't touch any other code.
      
      Since I don't know anything on ethernet drivers the rule 'works for me'
      is fully valid.
      
      
      
      4a493b70
    • Linus Torvalds's avatar
      Merge ia64 conflicts · e56b865f
      Linus Torvalds authored
      e56b865f
    • Linus Torvalds's avatar
      Merge bk://bk.arm.linux.org.uk/linux-2.6-serial · 5069356c
      Linus Torvalds authored
      into home.osdl.org:/home/torvalds/v2.5/linux
      5069356c
    • Linus Torvalds's avatar
      Merge bk://kernel.bkbits.net/davem/net-2.6 · c41a3ca5
      Linus Torvalds authored
      into home.osdl.org:/home/torvalds/v2.5/linux
      c41a3ca5
    • Andrew Morton's avatar
      [PATCH] dm: dm_table_event() sleep on spinlock bug · 7300a7e9
      Andrew Morton authored
      From: Joe Thornber <thornber@sistina.com>
      
      You can no longer call dm_table_event() from interrupt context.
      7300a7e9
    • Andrew Morton's avatar
      [PATCH] dm: set io restriction defaults · 5762bd47
      Andrew Morton authored
      From: Joe Thornber <thornber@sistina.com>
      
      Make sure that a target has a sensible set of default io restrictions.
      5762bd47
    • Andrew Morton's avatar
      [PATCH] dm: make v4 of the ioctl interface the default · 07525f19
      Andrew Morton authored
      From: Joe Thornber <thornber@sistina.com>
      
      Make the version-4 ioctl interface the default kernel configuration option.
      If you have out of date tools you will need to use the v1 interface.
      07525f19
    • Andrew Morton's avatar
      [PATCH] dm: remove dynamic table resizing · 938e284b
      Andrew Morton authored
      From: Joe Thornber <thornber@sistina.com>
      
      The dm table size is always known in advance, so we can specify it in
      dm_table_create(), rather than relying on dynamic resizing.
      938e284b
    • Andrew Morton's avatar
      [PATCH] dm: fix block device resizing · ecb24581
      Andrew Morton authored
      From: Joe Thornber <thornber@sistina.com>
      
      When setting the size of a Device-Mapper device in the gendisk entry, also
      try to set the size of the corresponding block_device entry's inode.  This is
      necessary to allow online device/filesystem resizing to work correctly. 
      [Kevin Corry]
      ecb24581
    • Andrew Morton's avatar
      [PATCH] name_to_dev_t() fix · fe08f9d5
      Andrew Morton authored
      From: viro@parcelfarce.linux.theplanet.co.uk
      
      When we register disks, we mangle the disk names that contain slashes (e.g.
      cciss/c0d0) replacing them with '!' in corresponding sysfs names.  So
      name_to_dev_t() should mangle the name in the same way before looking for it
      in /sys/block.
      fe08f9d5
    • Andrew Morton's avatar
      [PATCH] Kernel Locking Documentation update · f2d652b1
      Andrew Morton authored
      From: Rusty Russell <rusty@rustcorp.com.au>
      
      Entirely revised, and largely rewritten.  Has a continuing example now, which
      I think makes things clearer.  Also covers Read Copy Update.  This version
      further deprecates rwlock_t, shuffles sections for better organization.
      f2d652b1
    • Andrew Morton's avatar
      [PATCH] VIA audio fixes · 8f6f7260
      Andrew Morton authored
      From: Alan Cox <alan@redhat.com>
      
      VIA audio had a fix from 2.4 missing so any user could spam the system log. Also
      include a fix for a bug which is pending 2.4 fixing too and causes a bogus
      warning to be displayed on close of audio file handle.
      8f6f7260
    • Andrew Morton's avatar
      [PATCH] cycx_drv warning fix · d2613306
      Andrew Morton authored
      From: Alan Cox <alan@redhat.com>
      
      Type errors, just fixes a warning
      d2613306
    • Andrew Morton's avatar
      [PATCH] SCC warning fix · 3947d3ad
      Andrew Morton authored
      From: Alan Cox <alan@redhat.com>
      
      Just a warning fix and behaviour tidy. Changing the kiss.mintime variable isn't
      going to work as its exposed to user space
      3947d3ad
    • Andrew Morton's avatar
      [PATCH] update sn2 MAINTAINERS file entry · 991b02df
      Andrew Morton authored
      From: jbarnes@sgi.com (Jesse Barnes)
      
      Just a quick patch to fix MAINTAINERS for sn2.
      991b02df
    • Andrew Morton's avatar
      [PATCH] Winbond w83627hf driver · b61db7f2
      Andrew Morton authored
      From: Pádraig Brady <P@draigBrady.com>
      
      Watchdog driver for the Winbond w83627hf which is on the last 3 motherboards
      I got here for test (tyan, advantech, force).
      b61db7f2
    • Andrew Morton's avatar
      [PATCH] Fix ioctl related warnings in userspace · 995fa64b
      Andrew Morton authored
      From: Johannes Stezenbach <js@convergence.de>
      
      the patch below removes warnings like:
      
        warning: signed and unsigned type in conditional expression
      
      when compiling userspace applications against a glibc built with 2.6 kernel
      headers (like on Debian unstable).
      995fa64b
    • Andrew Morton's avatar
      [PATCH] Rename legacy_bus to platform_bus · 8299fdeb
      Andrew Morton authored
      From: Jeff Garzik <jgarzik@pobox.com>
      
      I've seen this patch floating around.  Not sure the origin, but it's 
      surfaced on lkml and also when I was poking around handhelds.org CVS for
      iPAQ patches:  on non-PCs, particularly system-on-chip devices but not
      just there, you have a custom "platform bus" that is the root of pretty 
      much all other devices and buses.
      
      It's something I wanted to make sure people didn't forget; to make sure 
      the legacy_bus didn't get "legacied out of existence."  ;-)
      8299fdeb
    • Andrew Morton's avatar
      [PATCH] synchronize use of mm->core_waiters · 99365bd4
      Andrew Morton authored
      From: Roland McGrath <roland@redhat.com>
      
      I believe I have identified a failure mode that Linus saw a couple weeks
      back when tracking down some other fork/exit sorts of races.  We saw this
      come up on rare occasions with the RHEL3 kernel's backport of the new code
      (while trying to track down other race failure modes we have yet to fix, sigh).
      
      I am talking about the following scenario:
      
      > Btw, even with the fix, doing a "while : ; ./crash t 10 ; done" will
      > eventually result in a stuck process:
      >
      > 	 1415 tty1     D      0:00 ./crash
      >
      > This is some kind of deadlock: most of the fifty threads are in "D"
      > state, with a trace something like
      >
      > 	 [<c011fbe3>] schedule+0x360/0x7f8
      > 	 [<c0120539>] wait_for_completion+0xd4/0x1c3
      > 	 [<c0128c9e>] do_exit+0x627/0x6a4
      > 	 [<c0128ddd>] do_group_exit+0x3d/0x177
      > 	 [<c0130c13>] dequeue_signal+0x2d/0x84
      > 	 [<c0133911>] get_signal_to_deliver+0x390/0x575
      > 	 [<c010a541>] do_signal+0x6c/0xf1
      > 	 [<c01200be>] default_wake_function+0x0/0x12
      > 	 [<c01200be>] default_wake_function+0x0/0x12
      > 	 [<c013d50f>] do_futex+0x6d/0x7d
      > 	 [<c013d635>] sys_futex+0x116/0x12f
      > 	 [<c010a601>] do_notify_resume+0x3b/0x3d
      > 	 [<c010a82e>] work_notifysig+0x13/0x15
      >
      > except for one that is trying to core-dump:
      >
      > 	 [<c0120539>] wait_for_completion+0xd4/0x1c3
      > 	 [<c01200be>] default_wake_function+0x0/0x12
      > 	 [<c01200be>] default_wake_function+0x0/0x12
      > 	 [<c02101aa>] rwsem_wake+0x86/0x12d
      > 	 [<c01738af>] coredump_wait+0xa8/0xaa
      > 	 [<c0173a26>] do_coredump+0x175/0x26c
      >
      > and three that are just doing a regular "exit()" system call:
      >
      > 	 [<c011fbe3>] schedule+0x360/0x7f8
      > 	 [<c011e19a>] recalc_task_prio+0x90/0x1aa
      > 	 [<c0120539>] wait_for_completion+0xd4/0x1c3
      > 	 [<c01200be>] default_wake_function+0x0/0x12
      > 	 [<c01200be>] default_wake_function+0x0/0x12
      > 	 [<c0210207>] rwsem_wake+0xe3/0x12d
      > 	 [<c0128c9e>] do_exit+0x627/0x6a4
      > 	 [<c0128d4d>] next_thread+0x0/0x53
      > 	 [<c010a7e3>] syscall_call+0x7/0xb
      >
      > However, the rest of the system is totally unaffected by this deadlock:
      > it's only deadlocked withing the thread group itself, nobody else cares.
      
      What happens here is a race between an exiting thread checking
      mm->core_waiters in __exit_mm, and the thread taking the core-dump signal
      (in coredump_wait) examining the first thread's ->mm pointer and
      incrementing mm->core_waiters to account for it.  There is no
      synchronization at all in __exit_mm's use of mm->core_waiters.  If the
      coredump_wait thread reads tsk->mm when tsk is in __exit_mm between
      checking mm->core_waiters and clearing tsk->mm, then it will increment
      mm->core_waiters and the total count will later exceed the number of
      threads that will ever decrement it and synchronize.  Hence it blocks forever.
      
      The following patch fixes the problem by using mm->mmap_sem in __exit_mm.
      The read lock must be held around checking mm->core_waiters and clearing
      tsk->mm so that coredump_wait (which gets the write lock) cannot come in
      between and do bogus bookkeeping.
      99365bd4
    • Andrew Morton's avatar
      [PATCH] DAC960 request queue per disk · dc942a21
      Andrew Morton authored
      From: Dave Olien <dmo@osdl.org>
      
      Here's a patch that changes the DAC960 driver from having one request
      queue for ALL disks on the controller, to having a request queue for
      each logical disk.  This turns out to make little difference for deadline
      scheduler, nor for AS scheduler under light IO load.  But under AS
      scheduler with heavy IO, it makes about a 40% difference on dbt2
      workload.  Here are the measured numbers:
      
      The 2.6.0-test11-D kernel version includes this mutli-queue patch to the
      DAC960 driver.
      
      For non-cached dbt2 workload  (heavy IO load)
      
      Scheduler	kernel/driver	NOTPM(bigger is better)
      AS		2.6.0-test11-D  1598
      AS		2.6.0-test11     973
      deadline	2.6.0-test11    1640
      deadline	2.6.0-test11-D  1645
      
      For cached dbt2 workload (lighter IO load)
      
      AS		2.6.0-test11-D  4993
      AS		2.6.-test6-mm4  4976, 4890, 4972
      deadline	2.6.0-test11-D  4998
      
      Can this be included in 2.6.0?  I know it's not a "critical patch"
      in the sense that something won't work without it.  On the other hand,
      the change is isolated to a driver.
      dc942a21
    • Andrew Morton's avatar
      [PATCH] fix userspace compiles with nbd.h · dd5a4db6
      Andrew Morton authored
      From: Paul Clements <Paul.Clements@SteelEye.com>
      
      A previous "cleanup" on the nbd.h header file broke userspace compiles.
      I've added an #ifdef __KERNEL__ so that userspace doesn't need to worry
      about the nbd_device structure, which is only used in-kernel. The patch
      allows me to compile my nbd tools with the 2.6 nbd.h.
      dd5a4db6
    • Andrew Morton's avatar
      [PATCH] isdn_ppp_ccp.c uses uninitialized spinlock · fe8bbcd3
      Andrew Morton authored
      From: Tonnerre Anklin <thunder@keepsake.ch>
      
      This spinlock was used uninitialized. Gave me a lot of warnings.
      fe8bbcd3
    • Andrew Morton's avatar
      [PATCH] nr_slab accounting fix · d71abcaf
      Andrew Morton authored
      From: Manfred Spraul <manfred@colorfullife.com>
      
      if alloc_slabmgmt fails, then kmem_freepages() calls sub_page_state(),
      altough nr_slab was not yet increased.  The attached patch fixes that by
      moving the inc_page_state into kmem_getpages().
      d71abcaf
    • Andrew Morton's avatar
      [PATCH] More MODULE_ALIASes · 6788a95d
      Andrew Morton authored
      From: Rusty Russell <rusty@rustcorp.com.au>
            Steve Youngs, Stephen Hemminger
      
      Three more MODULE_ALIASes.  Trivial, but useful if people want things
      to "just work" in 2.6.0.
      6788a95d
    • Andrew Morton's avatar
      [PATCH] struct_cpy compilation warning · e85132b2
      Andrew Morton authored
      From: Ingo Molnar <mingo@elte.hu>
      
      i've attached a minor fix for the 2.6.1 timeframe - we clearly meant
      __struct_cpy_bug().  Newest versions of gcc warn about this.
      e85132b2
    • Andrew Morton's avatar
      [PATCH] slab reclaim accounting fix · 1cdf0eef
      Andrew Morton authored
      From: Manfred Spraul <manfred@colorfullife.com>
      
      slab_reclaim_pages is increased even if get_free_pages fails.  The attached
      patch moves the update to the correct position.
      1cdf0eef
    • Andrew Morton's avatar
      [PATCH] fix outdated comment in jiffies.h · 162bc7d1
      Andrew Morton authored
      From: Tim Schmielau <tim@physik3.uni-rostock.de>
      162bc7d1
    • Andrew Morton's avatar
      [PATCH] Allow unimap change on non fg console · a4b05bb1
      Andrew Morton authored
      From: Kurt Garloff <garloff@suse.de>
      
      The comment in front of vt_ioctl() reads
      /*
       * We handle the console-specific ioctl's here.  We allow the
       * capability to modify any console, not just the fg_console.=20
       */
      
      Unfortunately, this does not apply to PIO_UNIMAPCLR, nor
      GIO_/PIO_UNIMAP. They always operate on the current foreground
      console, which is inconsistent at least. For most ioctls, the
      comment is applicable.
      
      It also causes problems, as setfont can't do the full job on
      the non-fg consoles. (OK, our setfont is slightly changed to
      even try it ... as you know.)
      
      The attached patch does fix this.
      
      I have a similar patch for 2.4, but it never got merged :-(
      because not many people seem to care and I submitted in the middle
      of the 2.4 series ...
      It has been in UnitedLinux/SUSE kernels for ages, though.
      a4b05bb1
    • Andrew Morton's avatar
      [PATCH] Clear dirty bits etc on compound frees · e86ff3c7
      Andrew Morton authored
      From: "Martin J. Bligh" <mbligh@aracnet.com>,
            Guillaume Morin <guillaume@morinfr.org>
      
      We need to clear the software dirty bit on the tail pages of a compound page
      when freeing it up.
      
      The tail pages can become dirtied by mmap'ing /dev/mem, and writing into
      any clustered page group (that a driver might have created or whatever).
      
      Plus it's better to run all these pages through the free_pages_check checks
      anyway.
      e86ff3c7
    • Andrew Morton's avatar
      [PATCH] list_empty_careful() documentation. · 3182fe92
      Andrew Morton authored
      From: Ingo Molnar <mingo@elte.hu>
      
      I'd also suggest the following patch below, to clarify the use of
      unsynchronized list_empty().  list_empty_careful() can only be safe in the
      very specific case of "one-shot" list entries which might be removed by
      another CPU.  (but nothing else can happen to them and this is their only
      final state.) list_empty_careful() is otherwise completely unsynchronized
      on both the compiler and CPU level and is not 'SMP safe' in any way.
      3182fe92
    • Andrew Morton's avatar
      [PATCH] MAINTAINERS vger.rutgers.edu · c13bb409
      Andrew Morton authored
      From: Geert Uytterhoeven <geert@linux-m68k.org>
      
      Mailing lists at vger.rutgers.edu are obsolete, use vger.kernel.org
      instead.
      c13bb409
    • Andrew Morton's avatar
      [PATCH] more correct get_compat_timespec interface · 0eea2040
      Andrew Morton authored
      From: Joe Korty <joe.korty@ccur.com>
      
      The API for get_compat_timespec / put_compat_timespec is incorrect, it
      forces a caller with const args to (incorrectly) cast.  The posix message
      queue patch is one such caller.
      0eea2040
    • Andrew Morton's avatar
      [PATCH] dvb i2c timeout fix · 0f4e98bc
      Andrew Morton authored
      From: Gerd Knorr <kraxel@bytesex.org>
      
      Below is a ObviouslyCorrect[tm] patch which fixes the i2c bus timeout
      handling in the saa7146 driver.
      0f4e98bc
    • Andrew Morton's avatar
      [PATCH] JBD: b_committed_data locking fix · 524e63d2
      Andrew Morton authored
      The locking rules say that b_committed_data is covered by
      jbd_lock_bh_state(), so implement that during the start of commit, while
      throwing away unused shadow buffers.
      
      I don't expect that there is really a race here, but them's the rules.
      524e63d2
    • Andrew Morton's avatar
      [PATCH] O_DIRECT memory leak fix · 7e3989bb
      Andrew Morton authored
      From: Badari Pulavarty <pbadari@us.ibm.com>
      
      I found the problem with O_DIRECT memory leak.
      
      The problem is, when we are doing DIO read and crossed the end of file - we
      don't release referencess on all the pages we got from get_user_pages().
      (since it is a success case).
      
      The fix is to call dio_cleanup() even for sucess cases.
      7e3989bb
    • Andrew Morton's avatar
      [PATCH] fix ELF exec with huge bss · 0363994f
      Andrew Morton authored
      From: Roland McGrath <roland@redhat.com>
      
      The following test program will crash every time if dynamically linked.
      I think this bites all 32-bit platforms, including 32-bit executables on
      64-bit platforms that support them (and could in theory bite 64-bit
      platforms with bss sizes beyond the bounds of comprehension).
      
      	volatile char hugebss[1080000000];
      	main() { printf("%p..%p\n", &hugebss[0], &hugebss[sizeof hugebss]);
      	 system("cat /proc/$PPID/maps");
      	 hugebss[sizeof hugebss - 1] = 1;
      	 return 23;
      	}
      
      The problem is that the kernel maps ld.so at 0x40000000 or some such place,
      before it maps the bss.  Here the bss is so large that it overlaps and
      clobbers that mapping.  I've changed it to map the bss before it loads the
      interpreter, so that part of the address space is reserved before ld.so's
      mapping (which doesn't really care where it goes) is done.
      
      This patch also adds error checking to the bss setup (and interpreter's bss
      setup).  With the aforementioned change but no error checking, "ulimit -v
      65536; ./hugebss" will crash in the store after the `system' call, because
      the kernel will have failed to allocate the bss and ignored the error, so
      the program runs without those pages being mapped at all.  With this change
      it dies with a SIGKILL as for a failure to set up stack pages.  It might be
      even better to try to detect the case earlier so that execve can return an
      error before it has wiped out the address space.  But that seems like it
      would always be fragile and miss some corner cases, so I did not try to add
      such complexity.
      0363994f