1. 24 Jul, 2008 25 commits
  2. 23 Jul, 2008 15 commits
    • Linus Torvalds's avatar
      Merge branch 'x86/auditsc' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland · 338b9bb3
      Linus Torvalds authored
      * 'x86/auditsc' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
        i386 syscall audit fast-path
        x86_64 ia32 syscall audit fast-path
        x86_64 syscall audit fast-path
        x86_64: remove bogus optimization in sysret_signal
      338b9bb3
    • Linus Torvalds's avatar
      Merge branch 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 7f9dce38
      Linus Torvalds authored
      * 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched: hrtick_enabled() should use cpu_active()
        sched, x86: clean up hrtick implementation
        sched: fix build error, provide partition_sched_domains() unconditionally
        sched: fix warning in inc_rt_tasks() to not declare variable 'rq' if it's not needed
        cpu hotplug: Make cpu_active_map synchronization dependency clear
        cpu hotplug, sched: Introduce cpu_active_map and redo sched domain managment (take 2)
        sched: rework of "prioritize non-migratable tasks over migratable ones"
        sched: reduce stack size in isolated_cpu_setup()
        Revert parts of "ftrace: do not trace scheduler functions"
      
      Fixed up conflicts in include/asm-x86/thread_info.h (due to the
      TIF_SINGLESTEP unification vs TIF_HRTICK_RESCHED removal) and
      kernel/sched_fair.c (due to cpu_active_map vs for_each_cpu_mask_nr()
      introduction).
      7f9dce38
    • Linus Torvalds's avatar
      Merge branch 'cpus4096-for-linus' of... · 26dcce0f
      Linus Torvalds authored
      Merge branch 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (31 commits)
        NR_CPUS: Replace NR_CPUS in speedstep-centrino.c
        cpumask: Provide a generic set of CPUMASK_ALLOC macros, FIXUP
        NR_CPUS: Replace NR_CPUS in cpufreq userspace routines
        NR_CPUS: Replace per_cpu(..., smp_processor_id()) with __get_cpu_var
        NR_CPUS: Replace NR_CPUS in arch/x86/kernel/genapic_flat_64.c
        NR_CPUS: Replace NR_CPUS in arch/x86/kernel/genx2apic_uv_x.c
        NR_CPUS: Replace NR_CPUS in arch/x86/kernel/cpu/proc.c
        NR_CPUS: Replace NR_CPUS in arch/x86/kernel/cpu/mcheck/mce_64.c
        cpumask: Optimize cpumask_of_cpu in lib/smp_processor_id.c, fix
        cpumask: Use optimized CPUMASK_ALLOC macros in the centrino_target
        cpumask: Provide a generic set of CPUMASK_ALLOC macros
        cpumask: Optimize cpumask_of_cpu in lib/smp_processor_id.c
        cpumask: Optimize cpumask_of_cpu in kernel/time/tick-common.c
        cpumask: Optimize cpumask_of_cpu in drivers/misc/sgi-xp/xpc_main.c
        cpumask: Optimize cpumask_of_cpu in arch/x86/kernel/ldt.c
        cpumask: Optimize cpumask_of_cpu in arch/x86/kernel/io_apic_64.c
        cpumask: Replace cpumask_of_cpu with cpumask_of_cpu_ptr
        Revert "cpumask: introduce new APIs"
        cpumask: make for_each_cpu_mask a bit smaller
        net: Pass reference to cpumask variable in net/sunrpc/svc.c
        ...
      
      Fix up trivial conflicts in drivers/cpufreq/cpufreq.c manually
      26dcce0f
    • Linus Torvalds's avatar
      Merge branch 'core/softlockup-for-linus' of... · d7b6de14
      Linus Torvalds authored
      Merge branch 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core/softlockup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        softlockup: fix invalid proc_handler for softlockup_panic
        softlockup: fix watchdog task wakeup frequency
        softlockup: fix watchdog task wakeup frequency
        softlockup: show irqtrace
        softlockup: print a module list on being stuck
        softlockup: fix NMI hangs due to lock race - 2.6.26-rc regression
        softlockup: fix false positives on nohz if CPU is 100% idle for more than 60 seconds
        softlockup: fix softlockup_thresh fix
        softlockup: fix softlockup_thresh unaligned access and disable detection at runtime
        softlockup: allow panic on lockup
      d7b6de14
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 30d38542
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (85 commits)
        [ARM] pxa: add base support for PXA930 Handheld Platform (aka SAAR)
        [ARM] pxa: add base support for PXA930 Evaluation Board (aka TavorEVB)
        [ARM] pxa: add base support for PXA930 (aka Tavor-P)
        [ARM] Update mach-types
        [ARM] pxa: make littleton to use the new smc91x platform data
        [ARM] pxa: make zylonite to use the new smc91x platform data
        [ARM] pxa: make mainstone to use the new smc91x platform data
        [ARM] pxa: make lubbock to use new smc91x platform data
        [NET] smc91x: prepare SMC_USE_PXA_DMA to be specified in platform data
        [NET] smc91x: prepare for SMC_IO_SHIFT to be a platform configurable variable
        [NET] smc91x: add SMC91X_NOWAIT flag to platform data
        [NET] smc91x: favor the use of SMC91X_USE_* instead of SMC_CAN_USE_*
        [NET] smc91x: remove "irq_flags" from "struct smc91x_platdata"
        [ARM] 5146/1: pxa2xx: convert all boards to call pxa2xx_transceiver_mode helper
        Support for LCD on e740 e750 e400 and e800 e-series PDAs
        E-series UDC support
        PXA UDC - allow use of inverted GPIO for pullup
        Add e350 support
        Fix broken e-series build
        E-series GPIO / IRQ definitions.
        ...
      30d38542
    • Roland McGrath's avatar
      i386 syscall audit fast-path · af0575bb
      Roland McGrath authored
      
      
      This adds fast paths for 32-bit syscall entry and exit when
      TIF_SYSCALL_AUDIT is set, but no other kind of syscall tracing.
      These paths does not need to save and restore all registers as
      the general case of tracing does.  Avoiding the iret return path
      when syscall audit is enabled helps performance a lot.
      Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
      af0575bb
    • Roland McGrath's avatar
      x86_64 ia32 syscall audit fast-path · 5cbf1565
      Roland McGrath authored
      
      
      This adds fast paths for 32-bit syscall entry and exit when
      TIF_SYSCALL_AUDIT is set, but no other kind of syscall tracing.
      These paths does not need to save and restore all registers as
      the general case of tracing does.  Avoiding the iret return path
      when syscall audit is enabled helps performance a lot.
      Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
      5cbf1565
    • Roland McGrath's avatar
      x86_64 syscall audit fast-path · 86a1c34a
      Roland McGrath authored
      
      
      This adds a fast path for 64-bit syscall entry and exit when
      TIF_SYSCALL_AUDIT is set, but no other kind of syscall tracing.
      This path does not need to save and restore all registers as
      the general case of tracing does.  Avoiding the iret return path
      when syscall audit is enabled helps performance a lot.
      Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
      86a1c34a
    • Roland McGrath's avatar
      x86_64: remove bogus optimization in sysret_signal · 15e8f348
      Roland McGrath authored
      
      
      This short-circuit path in sysret_signal looks wrong to me.
      AFAICT, in practice the branch is never taken--and if it were,
      it would go wrong.  To wit, try loading a module whose init
      function does set_thread_flag(TIF_IRET), and see insmod crash
      (presumably with a wrong user stack pointer).
      
      This is because the FIXUP_TOP_OF_STACK work hasn't been done yet
      when we jump around the call to ptregscall_common and get to
      int_with_check--where it expects the user RSP,SS,CS and EFLAGS to
      have been stored by FIXUP_TOP_OF_STACK.
      
      I don't think it's normally possible to get to sysret_signal with no
      _TIF_DO_NOTIFY_MASK bits set anyway, so these two instructions are
      already superfluous.  If it ever did happen, it is harmless to call
      do_notify_resume with nothing for it to do.
      Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
      15e8f348
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc · 20b7997e
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
        sdhci: highmem capable PIO routines
        sg: reimplement sg mapping iterator
        mmc_test: print message when attaching to card
        mmc: Remove Russell as primecell mci maintainer
        mmc_block: bounce buffer highmem support
        sdhci: fix bad warning from commit c8b3e02e
        sdhci: add warnings for bad buffers in ADMA path
        mmc_test: test oversized sg lists
        mmc_test: highmem tests
        s3cmci: ensure host stopped on machine shutdown
        au1xmmc: suspend/resume implementation
        s3cmci: fixes for section mismatch warnings
        pxamci: trivial fix of DMA alignment register bit clearing
      20b7997e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx · 5554b359
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (24 commits)
        I/OAT: I/OAT version 3.0 support
        I/OAT: tcp_dma_copybreak default value dependent on I/OAT version
        I/OAT: Add watchdog/reset functionality to ioatdma
        iop_adma: cleanup iop_chan_xor_slot_count
        iop_adma: document how to calculate the minimum descriptor pool size
        iop_adma: directly reclaim descriptors on allocation failure
        async_tx: make async_tx_test_ack a boolean routine
        async_tx: remove depend_tx from async_tx_sync_epilog
        async_tx: export async_tx_quiesce
        async_tx: fix handling of the "out of descriptor" condition in async_xor
        async_tx: ensure the xor destination buffer remains dma-mapped
        async_tx: list_for_each_entry_rcu() cleanup
        dmaengine: Driver for the Synopsys DesignWare DMA controller
        dmaengine: Add slave DMA interface
        dmaengine: add DMA_COMPL_SKIP_{SRC,DEST}_UNMAP flags to control dma unmap
        dmaengine: Add dma_client parameter to device_alloc_chan_resources
        dmatest: Simple DMA memcpy test client
        dmaengine: DMA engine driver for Marvell XOR engine
        iop-adma: fix platform driver hotplug/coldplug
        dmaengine: track the number of clients using a channel
        ...
      
      Fixed up conflict in drivers/dca/dca-sysfs.c manually
      5554b359
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb · 0f6e38a6
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
        kgdb: kgdboc console poll hooks for mpsc uart
        kgdb: kgdboc console poll hooks for cpm uart
        kgdb, powerpc: arch specific powerpc kgdb support
        kgdb: support for ARCH=arm
        kgdb: remove unused HAVE_ARCH_KGDB_SHADOW_INFO config variable
      0f6e38a6
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · e669e817
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (60 commits)
        ide: small whitespace fixes
        ide: ide-cd_ioctl.c fix sparse integer as NULL pointer warnings
        ide: ide-cd.c fix sparse endianness warnings
        ide-cd: convert to using the new atapi_flags
        ide: remove unused PC_FLAG_DRQ_INTERRUPT
        ide-scsi: convert to using the new atapi_flags
        ide-tape: convert to using the new atapi_flags
        ide-floppy: convert to using the new atapi_flags (take 2)
        ide: add per-device flags
        ide: use rq->cmd instead of pc->c in atapi common code
        ide-scsi: pass packet command in rq->cmd
        ide-tape: pass packet command in rq->cmd
        ide-tape: make room for packet command ids in rq->cmd
        ide-floppy: pass packet command in rq->cmd
        ide: remove pc->callback member from ide_atapi_pc
        ide-scsi: use drive->pc_callback instead of pc->callback
        ide-tape: use drive->pc_callback instead of pc->callback
        ide-floppy: use drive->pc_callback instead of pc->callback
        ide: push pc callback pointer into the ide_drive_t structure
        drivers/ide/ide-tape.c: remove double kfree
        ...
      e669e817
    • Pavel Machek's avatar
      ide: small whitespace fixes · fc410698
      Pavel Machek authored
      
      
      Small whitespace fixes for drivers/ide.
      Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      fc410698
    • Harvey Harrison's avatar
      ide: ide-cd_ioctl.c fix sparse integer as NULL pointer warnings · 1a677aba
      Harvey Harrison authored
      
      
      The function ide_cd_queue_pc should be checked as the bufflen arg is
      dereferenced and lots of callers are passing in NULL.
      
      drivers/ide/ide-cd_ioctl.c:124:46: warning: Using plain integer as NULL pointer
      drivers/ide/ide-cd_ioctl.c:149:47: warning: Using plain integer as NULL pointer
      drivers/ide/ide-cd_ioctl.c:231:46: warning: Using plain integer as NULL pointer
      drivers/ide/ide-cd_ioctl.c:374:46: warning: Using plain integer as NULL pointer
      Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Acked-by: default avatarBorislav Petkov <petkovbb@gmail.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      1a677aba