1. 23 Jul, 2011 31 commits
  2. 22 Jul, 2011 9 commits
    • Linus Torvalds's avatar
      Merge branch 'timers-rtc-for-linus' of... · 52de84f3
      Linus Torvalds authored
      Merge branch 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Serialize EFI time accesses on rtc_lock
        x86: Serialize SMP bootup CMOS accesses on rtc_lock
        rtc: stmp3xxx: Remove UIE handlers
        rtc: stmp3xxx: Get rid of mach-specific accessors
        rtc: stmp3xxx: Initialize drvdata before registering device
        rtc: stmp3xxx: Port stmp-functions to mxs-equivalents
        rtc: stmp3xxx: Restore register definitions
        rtc: vt8500: Use define instead of hardcoded value for status bit
      52de84f3
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of... · 112ec469
      Linus Torvalds authored
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        time: Fix stupid KERN_WARN compile issue
        rtc: Avoid accumulating time drift in suspend/resume
        time: Avoid accumulating time drift in suspend/resume
        time: Catch invalid timespec sleep values in __timekeeping_inject_sleeptime
      112ec469
    • Linus Torvalds's avatar
      Merge branch 'timers-cleanup-for-linus' of... · a99a7d14
      Linus Torvalds authored
      Merge branch 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        mips: Fix i8253 clockevent fallout
        i8253: Cleanup outb/inb magic
        arm: Footbridge: Use common i8253 clockevent
        mips: Use common i8253 clockevent
        x86: Use common i8253 clockevent
        i8253: Create common clockevent implementation
        i8253: Export i8253_lock unconditionally
        pcpskr: MIPS: Make config dependencies finer grained
        pcspkr: Cleanup Kconfig dependencies
        i8253: Move remaining content and delete asm/i8253.h
        i8253: Consolidate definitions of PIT_LATCH
        x86: i8253: Consolidate definitions of global_clock_event
        i8253: Alpha, PowerPC: Remove unused asm/8253pit.h
        alpha: i8253: Cleanup remaining users of i8253pit.h
        i8253: Remove I8253_LOCK config
        i8253: Make pcsp sound driver use the shared i8253_lock
        i8253: Make pcspkr input driver use the shared i8253_lock
        i8253: Consolidate all kernel definitions of i8253_lock
        i8253: Unify all kernel declarations of i8253_lock
        i8253: Create linux/i8253.h and use it in all 8253 related files
      a99a7d14
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of... · bdc7ccfc
      Linus Torvalds authored
      Merge branch 'sched-core-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: (24 commits)
        sched: Cleanup duplicate local variable in [enqueue|dequeue]_task_fair
        sched: Replace use of entity_key()
        sched: Separate group-scheduling code more clearly
        sched: Reorder root_domain to remove 64 bit alignment padding
        sched: Do not attempt to destroy uninitialized rt_bandwidth
        sched: Remove unused function cpu_cfs_rq()
        sched: Fix (harmless) typo 'CONFG_FAIR_GROUP_SCHED'
        sched, cgroup: Optimize load_balance_fair()
        sched: Don't update shares twice on on_rq parent
        sched: update correct entity's runtime in check_preempt_wakeup()
        xtensa: Use generic config PREEMPT definition
        h8300: Use generic config PREEMPT definition
        m32r: Use generic PREEMPT config
        sched: Skip autogroup when looking for all rt sched groups
        sched: Simplify mutex_spin_on_owner()
        sched: Remove rcu_read_lock() from wake_affine()
        sched: Generalize sleep inside spinlock detection
        sched: Make sleeping inside spinlock detection working in !CONFIG_PREEMPT
        sched: Isolate preempt counting in its own config option
        sched: Remove pointless in_atomic() definition check
        ...
      bdc7ccfc
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of... · 4d4abdcb
      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: (123 commits)
        perf: Remove the nmi parameter from the oprofile_perf backend
        x86, perf: Make copy_from_user_nmi() a library function
        perf: Remove perf_event_attr::type check
        x86, perf: P4 PMU - Fix typos in comments and style cleanup
        perf tools: Make test use the preset debugfs path
        perf tools: Add automated tests for events parsing
        perf tools: De-opt the parse_events function
        perf script: Fix display of IP address for non-callchain path
        perf tools: Fix endian conversion reading event attr from file header
        perf tools: Add missing 'node' alias to the hw_cache[] array
        perf probe: Support adding probes on offline kernel modules
        perf probe: Add probed module in front of function
        perf probe: Introduce debuginfo to encapsulate dwarf information
        perf-probe: Move dwarf library routines to dwarf-aux.{c, h}
        perf probe: Remove redundant dwarf functions
        perf probe: Move strtailcmp to string.c
        perf probe: Rename DIE_FIND_CB_FOUND to DIE_FIND_CB_END
        tracing/kprobe: Update symbol reference when loading module
        tracing/kprobes: Support module init function probing
        kprobes: Return -ENOENT if probe point doesn't exist
        ...
      4d4abdcb
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of... · 0342cbcf
      Linus Torvalds authored
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        rcu: Fix wrong check in list_splice_init_rcu()
        net,rcu: Convert call_rcu(xt_rateest_free_rcu) to kfree_rcu()
        sysctl,rcu: Convert call_rcu(free_head) to kfree
        vmalloc,rcu: Convert call_rcu(rcu_free_vb) to kfree_rcu()
        vmalloc,rcu: Convert call_rcu(rcu_free_va) to kfree_rcu()
        ipc,rcu: Convert call_rcu(ipc_immediate_free) to kfree_rcu()
        ipc,rcu: Convert call_rcu(free_un) to kfree_rcu()
        security,rcu: Convert call_rcu(sel_netport_free) to kfree_rcu()
        security,rcu: Convert call_rcu(sel_netnode_free) to kfree_rcu()
        ia64,rcu: Convert call_rcu(sn_irq_info_free) to kfree_rcu()
        block,rcu: Convert call_rcu(disk_free_ptbl_rcu_cb) to kfree_rcu()
        scsi,rcu: Convert call_rcu(fc_rport_free_rcu) to kfree_rcu()
        audit_tree,rcu: Convert call_rcu(__put_tree) to kfree_rcu()
        security,rcu: Convert call_rcu(whitelist_item_free) to kfree_rcu()
        md,rcu: Convert call_rcu(free_conf) to kfree_rcu()
      0342cbcf
    • Linus Torvalds's avatar
      Merge branch 'core-printk-for-linus' of... · 391d6276
      Linus Torvalds authored
      Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        lockdep: Fix trace_[soft,hard]irqs_[on,off]() recursion
        printk: Fix console_sem vs logbuf_lock unlock race
        printk: Release console_sem after logbuf_lock
      391d6276
    • Linus Torvalds's avatar
      Merge branch 'core-locking-for-linus' of... · 75b56ec2
      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:
        lockdep: Fix lockdep_no_validate against IRQ states
        mutex: Make mutex_destroy() an inline function
        plist: Remove the need to supply locks to plist heads
        lockup detector: Fix reference to the non-existent CONFIG_DETECT_SOFTLOCKUP option
      75b56ec2
    • Linus Torvalds's avatar
      Merge branch 'core-iommu-for-linus' of... · 6d16d6d9
      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:
        iommu/core: Fix build with INTR_REMAP=y && CONFIG_DMAR=n
        iommu/amd: Don't use MSI address range for DMA addresses
        iommu/amd: Move missing parts to drivers/iommu
        iommu: Move iommu Kconfig entries to submenu
        x86/ia64: intel-iommu: move to drivers/iommu/
        x86: amd_iommu: move to drivers/iommu/
        msm: iommu: move to drivers/iommu/
        drivers: iommu: move to a dedicated folder
        x86/amd-iommu: Store device alias as dev_data pointer
        x86/amd-iommu: Search for existind dev_data before allocting a new one
        x86/amd-iommu: Allow dev_data->alias to be NULL
        x86/amd-iommu: Use only dev_data in low-level domain attach/detach functions
        x86/amd-iommu: Use only dev_data for dte and iotlb flushing routines
        x86/amd-iommu: Store ATS state in dev_data
        x86/amd-iommu: Store devid in dev_data
        x86/amd-iommu: Introduce global dev_data_list
        x86/amd-iommu: Remove redundant device_flush_dte() calls
        iommu-api: Add missing header file
      
      Fix up trivial conflicts (independent additions close to each other) in
      drivers/Makefile and include/linux/pci.h
      6d16d6d9