Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.25-rc6
Commits on Mar 16, 2008
  1. Linus Torvalds

    Linux 2.6.25-rc6

    torvalds authored
  2. Linus Torvalds

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds authored
    …t/kyle/parisc-2.6
    
    * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
      [PARISC] make ptr_to_pide() static
      [PARISC] head.S: section mismatch fixes
      [PARISC] add back Crestone Peak cpu
      [PARISC] futex: special case cmpxchg NULL in kernel space
      [PARISC] clean up show_stack
      [PARISC] add pa8900 CPUs to hardware inventory
      [PARISC] clean up include/asm-parisc/elf.h
      [PARISC] move defconfig to arch/parisc/configs/
      [PARISC] add back AD1889 MAINTAINERS entry
      [PARISC] pdc_console: fix bizarre panic on boot
      [PARISC] dump_stack in show_regs
      [PARISC] pdc_stable: fix compile errors
      [PARISC] remove unused pdc_iodc_printf function
      [PARISC] bump __NR_syscalls
      [PARISC] unbreak pgalloc.h
      [PARISC] move VMALLOC_* definitions to fixmap.h
      [PARISC] wire up timerfd syscalls
      [PARISC] remove old timerfd syscall
  3. FUJITA Tomonori

    [PARISC] make ptr_to_pide() static

    fujita authored Kyle McMartin committed
    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  4. [PARISC] head.S: section mismatch fixes

    Helge Deller authored Kyle McMartin committed
    - move boot_args[] into the init section
    - move $global$ into the read_mostly section
    - fix the following two section mismatches:
    WARNING: vmlinux.o(.text+0x9c): Section mismatch: reference to .init.text:start_kernel (between '$pgt_fill_loop' and '$is_pa20')
    WARNING: vmlinux.o(.text+0xa0): Section mismatch: reference to .init.text:start_kernel (between '$pgt_fill_loop' and '$is_pa20')
    
    Signed-off-by: Helge Deller <deller@gmx.de>
    SIgned-off-by: Kyle McMartin <kyle@mcmartin.ca>
  5. [PARISC] add back Crestone Peak cpu

    Kyle McMartin authored
    Crestone Peak Slow is the 800MHz PA-8800 cpu in the C8000.
    0x88B is probably the Crestone Peak Fast.
    
    Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
  6. [PARISC] futex: special case cmpxchg NULL in kernel space

    Kyle McMartin authored
    Commit a0c1e90 added code to futex.c
    to detect whether futex_atomic_cmpxchg_inatomic was implemented at run
    time:
    
    +       curval = cmpxchg_futex_value_locked(NULL, 0, 0);
    +       if (curval == -EFAULT)
    +               futex_cmpxchg_enabled = 1;
    
    This is bogus on parisc, since page zero in kernel virtual space is the
    gateway page for syscall entry, and should not be read from the kernel.
    (That, and we really don't like the kernel faulting on its own address
     space...)
    
    Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
  7. [PARISC] clean up show_stack

    Kyle McMartin authored
    When we show_regs, we obviously have a struct pt_regs of the calling
    frame. Use these in show_stack so we don't have the entire bogus call trace
    up to the show_stack call.
    
    Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
  8. [PARISC] add pa8900 CPUs to hardware inventory

    James Bottomley authored Kyle McMartin committed
    This patch adds the known pa8900 CPUs to the inventory list and removes
    the Crestone Peak one which apparently never escaped into the wild.
    
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
    Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
  9. [PARISC] clean up include/asm-parisc/elf.h

    Randolph Chung authored Kyle McMartin committed
    Cleanup some cruft. No functionality changes.
    
    Signed-off-by: Randolph Chung <tausq@parisc-linux.org>
    Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
  10. [PARISC] move defconfig to arch/parisc/configs/

    Adrian Bunk authored Kyle McMartin committed
    This patch moves the default parisc defconfig to
    arch/parisc/configs/generic_defconfig where it belongs and selects it as
    the default defconfig through KBUILD_DEFCONFIG.
    
    Signed-off-by: Adrian Bunk <adrian.bunk@movial.fi>
    Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
  11. [PARISC] add back AD1889 MAINTAINERS entry

    Thibaut VARENE authored Kyle McMartin committed
    Signed-off-by: Thibaut VARENE <T-Bone@parisc-linux.org>
    Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
  12. [PARISC] pdc_console: fix bizarre panic on boot

    Kyle McMartin authored
    Commit 721fdf3 introduced a subtle bug
    by accidently removing the "static" from iodc_dbuf. This resulted in, what
    appeared to be, a trap without *current set to a task. Probably the result of
    a trap in real mode while calling firmware.
    
    Also do other misc clean ups. Since the only input from firmware is non
    blocking, share iodc_dbuf between input and output, and spinlock the
    only callers.
    
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  13. [PARISC] dump_stack in show_regs

    Kyle McMartin authored
    Originally, show_stack was used in BUG() output. However, a recent commit
    changed it to print register state (no idea what that's supposed to help,
    really...) and parisc was missing a backtrace because of it.
    
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  14. [PARISC] pdc_stable: fix compile errors

    Joel Soete authored Kyle McMartin committed
    Signed-off-by: Joel Soete <rubisher@scarlet.be>
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  15. [PARISC] remove unused pdc_iodc_printf function

    Kyle McMartin authored
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  16. [PARISC] bump __NR_syscalls

    Kyle McMartin authored
    oops, forgot this in the previous commit.
    
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  17. [PARISC] unbreak pgalloc.h

    Kyle McMartin authored
    Commit 2f569af broke the compile
    rather spectacularly. Fix code errors.
    
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  18. [PARISC] move VMALLOC_* definitions to fixmap.h

    Kyle McMartin authored
    They make way more sense here, really...
    
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  19. [PARISC] wire up timerfd syscalls

    Kyle McMartin authored
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
  20. [PARISC] remove old timerfd syscall

    Kyle McMartin authored
    Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Commits on Mar 15, 2008
  1. Linus Torvalds

    ACPI: Remove ACPI_CUSTOM_DSDT_INITRD option

    torvalds authored
    This essentially reverts commit 71fc47a
    ("ACPI: basic initramfs DSDT override support"), because the code simply
    isn't ready.
    
    It did ugly things to the init sequence to populate the rootfs image
    early, but that just ended up showing other problems with the whole
    approach.  The fact is, the VFS layer simply isn't initialized this
    early, and the relevant ACPI code should either run much later, or this
    shouldn't be done at all.
    
    For 2.6.25, we'll just pick the latter option.  We can revisit this
    concept later if necessary.
    
    Cc: Dave Hansen <haveblue@us.ibm.com>
    Cc: Tilman Schmidt <tilman@imap.cc>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Thomas Renninger <trenn@suse.de>
    Cc: Eric Piel <eric.piel@tremplin-utc.net>
    Cc: Len Brown <len.brown@intel.com>
    Cc: Christoph Hellwig <hch@infradead.org>
    Cc: Markus Gaugusch <dsdt@gaugusch.at>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. Linus Torvalds

    tifm_sd: DATA_CARRY is not boolean in tifm_sd_transfer_data()

    Roel Kluin authored torvalds committed
    DATA_CARRY is not boolean
    
    Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
    Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      [NET]: Fix tbench regression in 2.6.25-rc1
  4. sched: simplify sched_slice()

    Ingo Molnar authored
    Use the existing calc_delta_mine() calculation for sched_slice(). This
    saves a divide and simplifies the code because we share it with the
    other /cfs_rq->load users.
    
    It also improves code size:
    
          text    data     bss     dec     hex filename
         42659    2740     144   45543    b1e7 sched.o.before
         42093    2740     144   44977    afb1 sched.o.after
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
  5. sched: fix fair sleepers

    Ingo Molnar authored
    Fair sleepers need to scale their latency target down by runqueue
    weight. Otherwise busy systems will gain ever larger sleep bonus.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
  6. sched: fix overload performance: buddy wakeups

    Peter Zijlstra authored Ingo Molnar committed
    Currently we schedule to the leftmost task in the runqueue. When the
    runtimes are very short because of some server/client ping-pong,
    especially in over-saturated workloads, this will cycle through all
    tasks trashing the cache.
    
    Reduce cache trashing by keeping dependent tasks together by running
    newly woken tasks first. However, by not running the leftmost task first
    we could starve tasks because the wakee can gain unlimited runtime.
    
    Therefore we only run the wakee if its within a small
    (wakeup_granularity) window of the leftmost task. This preserves
    fairness, but does alternate server/client task groups.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  7. sched: fix calc_delta_mine()

    Ingo Molnar authored
    lw->weight can be 0 for a short time during bootup.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
  8. sched: fix update_load_add()/sub()

    Ingo Molnar authored
    Clear the cached inverse value when updating load. This is needed for
    calc_delta_mine() to work correctly when using the rq load.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
  9. sched: min_vruntime fix

    Peter Zijlstra authored Ingo Molnar committed
    Current min_vruntime tracking is incorrect and will cause serious
    problems when we don't run the leftmost task for some reason.
    
    min_vruntime does two things; 1) it's used to determine a forward
    direction when the u64 vruntime wraps, 2) it's used to track the
    leftmost vruntime to position newly enqueued tasks from.
    
    The current logic advances min_vruntime whenever the current task's
    vruntime advance. Because the current task may pass the leftmost task
    still waiting we're failing the second goal. This causes new tasks to be
    placed too far ahead and thus penalizes their runtime.
    
    Fix this by making min_vruntime the min_vruntime of the waiting tasks by
    tracking it in enqueue/dequeue, and compare against current's vruntime
    to obtain the absolute minimum when placing new tasks.
    
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  10. h-shimamoto

    sched: fix race in schedule()

    h-shimamoto authored Ingo Molnar committed
    Fix a hard to trigger crash seen in the -rt kernel that also affects
    the vanilla scheduler.
    
    There is a race condition between schedule() and some dequeue/enqueue
    functions; rt_mutex_setprio(), __setscheduler() and sched_move_task().
    
    When scheduling to idle, idle_balance() is called to pull tasks from
    other busy processor. It might drop the rq lock. It means that those 3
    functions encounter on_rq=0 and running=1. The current task should be
    put when running.
    
    Here is a possible scenario:
    
       CPU0                               CPU1
        |                              schedule()
        |                              ->deactivate_task()
        |                              ->idle_balance()
        |                              -->load_balance_newidle()
    rt_mutex_setprio()                     |
        |                              --->double_lock_balance()
        *get lock                          *rel lock
        * on_rq=0, ruuning=1               |
        * sched_class is changed           |
        *rel lock                          *get lock
        :                                  |
                                           :
                                       ->put_prev_task_rt()
                                       ->pick_next_task_fair()
                                           => panic
    
    The current process of CPU1(P1) is scheduling. Deactivated P1, and the
    scheduler looks for another process on other CPU's runqueue because CPU1
    will be idle. idle_balance(), load_balance_newidle() and
    double_lock_balance() are called and double_lock_balance() could drop
    the rq lock. On the other hand, CPU0 is trying to boost the priority of
    P1. The result of boosting only P1's prio and sched_class are changed to
    RT. The sched entities of P1 and P1's group are never put. It makes
    cfs_rq invalid, because the cfs_rq has curr and no leaf, but
    pick_next_task_fair() is called, then the kernel panics.
    
    Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
Commits on Mar 14, 2008
  1. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: fw-ohci: shut up false compiler warning on PPC32
      firewire: fw-ohci: use dma_alloc_coherent for ar_buffer
      ieee1394: sbp2: fix for SYM13FW500 bridge (Datafab disk)
      firewire: fw-sbp2: fix for SYM13FW500 bridge (Datafab disk)
      firewire: update Kconfig help text
      firewire: warn on fatal condition in topology code
      firewire: fw-sbp2: set single-phase retry_limit
      firewire: fw-ohci: Apple UniNorth 1st generation support
      firewire: fw-ohci: PPC PMac platform code
      firewire: endianess annotations
      firewire: endianess fix
  2. Linus Torvalds

    nfsd: fix oops on access from high-numbered ports

    J. Bruce Fields authored torvalds committed
    This bug was always here, but before my commit 6fa0283
    ("recheck for secure ports in fh_verify"), it could only be triggered by
    failure of a kmalloc().  After that commit it could be triggered by a
    client making a request from a non-reserved port for access to an export
    marked "secure".  (Exports are "secure" by default.)
    
    The result is a struct svc_export with a reference count one too low,
    resulting in likely oopses next time the export is accessed.
    
    The reference counting here is not straightforward; a later patch will
    clean up fh_verify().
    
    Thanks to Lukas Hejtmanek for the bug report and followup.
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    Cc: Lukas Hejtmanek <xhejtman@ics.muni.cz>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. Marc Dionne Linus Torvalds

    struct export_operations: adjust comments to match current members

    mdionne authored torvalds committed
    The comments in the definition of struct export_operations don't match the
    current members.
    
    Add a comment for the 2 new functions and remove 2 comments for unused ones.
    
    Signed-off-by: Marc Dionne <marc.c.dionne@gmail.com>
    Acked-by: David Howells <dhowells@redhat.com>
    Acked-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Mar 13, 2008
  1. firewire: fw-ohci: shut up false compiler warning on PPC32

    Stefan Richter authored
    Shut up "may be used uninitialised in this function" warnings due to
    PPC32's implementation of dma_alloc_coherent().
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
  2. firewire: fw-ohci: use dma_alloc_coherent for ar_buffer

    Jarod Wilson authored Stefan Richter committed
    Currently, we do nothing to guarantee we have a consistent DMA buffer for
    asynchronous receive packets. Rather than doing several sync's following a
    dma_map_single() to get consistent buffers, just switch to using
    dma_alloc_coherent().
    
    Resolves constant buffer failures on my own x86_64 laptop w/4GB of RAM and
    likely to fix a number of other failures witnessed on x86_64 systems with
    4GB of RAM or more.
    
    Signed-off-by: Jarod Wilson <jwilson@redhat.com>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Something went wrong with that request. Please try again.