1. 20 May, 2011 7 commits
    • Linus Torvalds's avatar
      Merge branch 'timers-clockevents-for-linus' of... · 7e6628e4
      Linus Torvalds authored
      Merge branch 'timers-clockevents-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-clockevents-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: hpet: Cleanup the clockevents init and register code
        x86: Convert PIT to clockevents_config_and_register()
        clockevents: Provide interface to reconfigure an active clock event device
        clockevents: Provide combined configure and register function
        clockevents: Restructure clock_event_device members
        clocksource: Get rid of the hardcoded 5 seconds sleep time limit
        clocksource: Restructure clocksource struct members
      7e6628e4
    • Linus Torvalds's avatar
      Merge branch 'timers-clocksource-for-linus' of... · 0f1bdc18
      Linus Torvalds authored
      Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        clocksource: convert mips to generic i8253 clocksource
        clocksource: convert x86 to generic i8253 clocksource
        clocksource: convert footbridge to generic i8253 clocksource
        clocksource: add common i8253 PIT clocksource
        blackfin: convert to clocksource_register_hz
        mips: convert to clocksource_register_hz/khz
        sparc: convert to clocksource_register_hz/khz
        alpha: convert to clocksource_register_hz
        microblaze: convert to clocksource_register_hz/khz
        ia64: convert to clocksource_register_hz/khz
        x86: Convert remaining x86 clocksources to clocksource_register_hz/khz
        Make clocksource name const
      0f1bdc18
    • Linus Torvalds's avatar
      Merge branches 'sched-core-for-linus' and 'sched-urgent-for-linus' of... · 80fe02b5
      Linus Torvalds authored
      Merge branches 'sched-core-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (60 commits)
        sched: Fix and optimise calculation of the weight-inverse
        sched: Avoid going ahead if ->cpus_allowed is not changed
        sched, rt: Update rq clock when unthrottling of an otherwise idle CPU
        sched: Remove unused parameters from sched_fork() and wake_up_new_task()
        sched: Shorten the construction of the span cpu mask of sched domain
        sched: Wrap the 'cfs_rq->nr_spread_over' field with CONFIG_SCHED_DEBUG
        sched: Remove unused 'this_best_prio arg' from balance_tasks()
        sched: Remove noop in alloc_rt_sched_group()
        sched: Get rid of lock_depth
        sched: Remove obsolete comment from scheduler_tick()
        sched: Fix sched_domain iterations vs. RCU
        sched: Next buddy hint on sleep and preempt path
        sched: Make set_*_buddy() work on non-task entities
        sched: Remove need_migrate_task()
        sched: Move the second half of ttwu() to the remote cpu
        sched: Restructure ttwu() some more
        sched: Rename ttwu_post_activation() to ttwu_do_wakeup()
        sched: Remove rq argument from ttwu_stat()
        sched: Remove rq->lock from the first half of ttwu()
        sched: Drop rq->lock from sched_exec()
        ...
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched: Fix rt_rq runtime leakage bug
      80fe02b5
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of... · df48d871
      Linus Torvalds authored
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (107 commits)
        perf stat: Add more cache-miss percentage printouts
        perf stat: Add -d -d and -d -d -d options to show more CPU events
        ftrace/kbuild: Add recordmcount files to force full build
        ftrace: Add self-tests for multiple function trace users
        ftrace: Modify ftrace_set_filter/notrace to take ops
        ftrace: Allow dynamically allocated function tracers
        ftrace: Implement separate user function filtering
        ftrace: Free hash with call_rcu_sched()
        ftrace: Have global_ops store the functions that are to be traced
        ftrace: Add ops parameter to ftrace_startup/shutdown functions
        ftrace: Add enabled_functions file
        ftrace: Use counters to enable functions to trace
        ftrace: Separate hash allocation and assignment
        ftrace: Create a global_ops to hold the filter and notrace hashes
        ftrace: Use hash instead for FTRACE_FL_FILTER
        ftrace: Replace FTRACE_FL_NOTRACE flag with a hash of ignored functions
        perf bench, x86: Add alternatives-asm.h wrapper
        x86, 64-bit: Fix copy_[to/from]_user() checks for the userspace address limit
        x86, mem: memset_64.S: Optimize memset by enhanced REP MOVSB/STOSB
        x86, mem: memmove_64.S: Optimize memmove by enhanced REP MOVSB/STOSB
        ...
      df48d871
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of... · acd30250
      Linus Torvalds authored
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        irq: Export functions to allow modular irq drivers
        genirq: Uninline and sanity check generic_handle_irq()
        genirq: Remove pointless ifdefs
        genirq: Make generic irq chip depend on CONFIG_GENERIC_IRQ_CHIP
        genirq: Add chip suspend and resume callbacks
        genirq: Implement a generic interrupt chip
        genirq: Support per-IRQ thread disabling.
        genirq: irq_desc: Document preflow_handler and affinity_hint
        genirq: Update DocBook comments
        genirq: Forgotten updates/deletions after removal of compat code
      acd30250
    • Linus Torvalds's avatar
      Merge branch 'core-locking-for-linus' of... · 6595b4a9
      Linus Torvalds authored
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        seqlock: Don't smp_rmb in seqlock reader spin loop
        watchdog, hung_task_timeout: Add Kconfig configurable default
        lockdep: Remove cmpxchg to update nr_chain_hlocks
        lockdep: Print a nicer description for simple irq lock inversions
        lockdep: Replace "Bad BFS generated tree" message with something less cryptic
        lockdep: Print a nicer description for irq inversion bugs
        lockdep: Print a nicer description for simple deadlocks
        lockdep: Print a nicer description for normal deadlocks
        lockdep: Print a nicer description for irq lock inversions
      6595b4a9
    • Linus Torvalds's avatar
      Merge branch 'core-iommu-for-linus' of... · cbdad8dc
      Linus Torvalds authored
      Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, gart: Rename pci-gart_64.c to amd_gart_64.c
        x86/amd-iommu: Use threaded interupt handler
        arch/x86/kernel/pci-iommu_table.c: Convert sprintf_symbol to %pS
        x86/amd-iommu: Add support for invalidate_all command
        x86/amd-iommu: Add extended feature detection
        x86/amd-iommu: Add ATS enable/disable code
        x86/amd-iommu: Add flag to indicate IOTLB support
        x86/amd-iommu: Flush device IOTLB if ATS is enabled
        x86/amd-iommu: Select PCI_IOV with AMD IOMMU driver
        PCI: Move ATS declarations in seperate header file
        dma-debug: print information about leaked entry
        x86/amd-iommu: Flush all internal TLBs when IOMMUs are enabled
        x86/amd-iommu: Rename iommu_flush_device
        x86/amd-iommu: Improve handling of full command buffer
        x86/amd-iommu: Rename iommu_flush* to domain_flush*
        x86/amd-iommu: Remove command buffer resetting logic
        x86/amd-iommu: Cleanup completion-wait handling
        x86/amd-iommu: Cleanup inv_pages command handling
        x86/amd-iommu: Move inv-dte command building to own function
        x86/amd-iommu: Move compl-wait command building to own function
      cbdad8dc
  2. 19 May, 2011 33 commits