1. 18 May, 2010 13 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 07d77759
      Linus Torvalds authored
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86, hypervisor: add missing <linux/module.h>
        Modify the VMware balloon driver for the new x86_hyper API
        x86, hypervisor: Export the x86_hyper* symbols
        x86: Clean up the hypervisor layer
        x86, HyperV: fix up the license to mshyperv.c
        x86: Detect running on a Microsoft HyperV system
        x86, cpu: Make APERF/MPERF a normal table-driven flag
        x86, k8: Fix build error when K8_NB is disabled
        x86, cacheinfo: Disable index in all four subcaches
        x86, cacheinfo: Make L3 cache info per node
        x86, cacheinfo: Reorganize AMD L3 cache structure
        x86, cacheinfo: Turn off L3 cache index disable feature in virtualized environments
        x86, cacheinfo: Unify AMD L3 cache index disable checking
        cpufreq: Unify sysfs attribute definition macros
        powernow-k8: Fix frequency reporting
        x86, cpufreq: Add APERF/MPERF support for AMD processors
        x86: Unify APERF/MPERF support
        powernow-k8: Add core performance boost support
        x86, cpu: Add AMD core boosting feature flag to /proc/cpuinfo
      
      Fix up trivial conflicts in arch/x86/kernel/cpu/intel_cacheinfo.c and
      drivers/cpufreq/cpufreq_ondemand.c
      07d77759
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of... · b7723f9d
      Linus Torvalds authored
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Clean up arch/x86/Kconfig*
        x86-64: Don't export init_level4_pgt
      b7723f9d
    • Linus Torvalds's avatar
      Merge branch 'x86-atomic-for-linus' of... · 93c9d7f6
      Linus Torvalds authored
      Merge branch 'x86-atomic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-atomic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Fix LOCK_PREFIX_HERE for uniprocessor build
        x86, atomic64: In selftest, distinguish x86-64 from 586+
        x86-32: Fix atomic64_inc_not_zero return value convention
        lib: Fix atomic64_inc_not_zero test
        lib: Fix atomic64_add_unless return value convention
        x86-32: Fix atomic64_add_unless return value convention
        lib: Fix atomic64_add_unless test
        x86: Implement atomic[64]_dec_if_positive()
        lib: Only test atomic64_dec_if_positive on archs having it
        x86-32: Rewrite 32-bit atomic64 functions in assembly
        lib: Add self-test for atomic64_t
        x86-32: Allow UP/SMP lock replacement in cmpxchg64
        x86: Add support for lock prefix in alternatives
      93c9d7f6
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 7421a10d
      Linus Torvalds authored
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Use .cfi_sections for assembly code
        x86-64: Reduce SMP locks table size
        x86, asm: Introduce and use percpu_inc()
      7421a10d
    • Linus Torvalds's avatar
      Merge branch 'tracing-core-for-linus' of... · 752f114f
      Linus Torvalds authored
      Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        tracing: Fix "integer as NULL pointer" warning.
        tracing: Fix tracepoint.h DECLARE_TRACE() to allow more than one header
        tracing: Make the documentation clear on trace_event boot option
        ring-buffer: Wrap open-coded WARN_ONCE
        tracing: Convert nop macros to static inlines
        tracing: Fix sleep time function profiling
        tracing: Show sample std dev in function profiling
        tracing: Add documentation for trace commands mod, traceon/traceoff
        ring-buffer: Make benchmark handle missed events
        ring-buffer: Make non-consuming read less expensive with lots of cpus.
        tracing: Add graph output support for irqsoff tracer
        tracing: Have graph flags passed in to ouput functions
        tracing: Add ftrace events for graph tracer
        tracing: Dump either the oops's cpu source or all cpus buffers
        tracing: Fix uninitialized variable of tracing/trace output
      752f114f
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of... · b8ae30ee
      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: (49 commits)
        stop_machine: Move local variable closer to the usage site in cpu_stop_cpu_callback()
        sched, wait: Use wrapper functions
        sched: Remove a stale comment
        ondemand: Make the iowait-is-busy time a sysfs tunable
        ondemand: Solve a big performance issue by counting IOWAIT time as busy
        sched: Intoduce get_cpu_iowait_time_us()
        sched: Eliminate the ts->idle_lastupdate field
        sched: Fold updating of the last_update_time_info into update_ts_time_stats()
        sched: Update the idle statistics in get_cpu_idle_time_us()
        sched: Introduce a function to update the idle statistics
        sched: Add a comment to get_cpu_idle_time_us()
        cpu_stop: add dummy implementation for UP
        sched: Remove rq argument to the tracepoints
        rcu: need barrier() in UP synchronize_sched_expedited()
        sched: correctly place paranioa memory barriers in synchronize_sched_expedited()
        sched: kill paranoia check in synchronize_sched_expedited()
        sched: replace migration_thread with cpu_stop
        stop_machine: reimplement using cpu_stop
        cpu_stop: implement stop_cpu[s]()
        sched: Fix select_idle_sibling() logic in select_task_rq_fair()
        ...
      b8ae30ee
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of... · 4d7b4ac2
      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: (311 commits)
        perf tools: Add mode to build without newt support
        perf symbols: symbol inconsistency message should be done only at verbose=1
        perf tui: Add explicit -lslang option
        perf options: Type check all the remaining OPT_ variants
        perf options: Type check OPT_BOOLEAN and fix the offenders
        perf options: Check v type in OPT_U?INTEGER
        perf options: Introduce OPT_UINTEGER
        perf tui: Add workaround for slang < 2.1.4
        perf record: Fix bug mismatch with -c option definition
        perf options: Introduce OPT_U64
        perf tui: Add help window to show key associations
        perf tui: Make <- exit menus too
        perf newt: Add single key shortcuts for zoom into DSO and threads
        perf newt: Exit browser unconditionally when CTRL+C, q or Q is pressed
        perf newt: Fix the 'A'/'a' shortcut for annotate
        perf newt: Make <- exit the ui_browser
        x86, perf: P4 PMU - fix counters management logic
        perf newt: Make <- zoom out filters
        perf report: Report number of events, not samples
        perf hist: Clarify events_stats fields usage
        ...
      
      Fix up trivial conflicts in kernel/fork.c and tools/perf/builtin-record.c
      4d7b4ac2
    • Linus Torvalds's avatar
      Merge branch 'oprofile-for-linus' of... · 3aaf51ac
      Linus Torvalds authored
      Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits)
        oprofile/x86: make AMD IBS hotplug capable
        oprofile/x86: notify cpus only when daemon is running
        oprofile/x86: reordering some functions
        oprofile/x86: stop disabled counters in nmi handler
        oprofile/x86: protect cpu hotplug sections
        oprofile/x86: remove CONFIG_SMP macros
        oprofile/x86: fix uninitialized counter usage during cpu hotplug
        oprofile/x86: remove duplicate IBS capability check
        oprofile/x86: move IBS code
        oprofile/x86: return -EBUSY if counters are already reserved
        oprofile/x86: moving shutdown functions
        oprofile/x86: reserve counter msrs pairwise
        oprofile/x86: rework error handler in nmi_setup()
        oprofile: update file list in MAINTAINERS file
        oprofile: protect from not being in an IRQ context
        oprofile: remove double ring buffering
        ring-buffer: Add lost event count to end of sub buffer
        tracing: Show the lost events in the trace_pipe output
        ring-buffer: Add place holder recording of dropped events
        tracing: Fix compile error in module tracepoints when MODULE_UNLOAD not set
        ...
      3aaf51ac
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of... · f262af3d
      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: (24 commits)
        rcu: remove all rcu head initializations, except on_stack initializations
        rcu head introduce rcu head init on stack
        Debugobjects transition check
        rcu: fix build bug in RCU_FAST_NO_HZ builds
        rcu: RCU_FAST_NO_HZ must check RCU dyntick state
        rcu: make SRCU usable in modules
        rcu: improve the RCU CPU-stall warning documentation
        rcu: reduce the number of spurious RCU_SOFTIRQ invocations
        rcu: permit discontiguous cpu_possible_mask CPU numbering
        rcu: improve RCU CPU stall-warning messages
        rcu: print boot-time console messages if RCU configs out of ordinary
        rcu: disable CPU stall warnings upon panic
        rcu: enable CPU_STALL_VERBOSE by default
        rcu: slim down rcutiny by removing rcu_scheduler_active and friends
        rcu: refactor RCU's context-switch handling
        rcu: rename rcutiny rcu_ctrlblk to rcu_sched_ctrlblk
        rcu: shrink rcutiny by making synchronize_rcu_bh() be inline
        rcu: fix now-bogus rcu_scheduler_active comments.
        rcu: Fix bogus CONFIG_PROVE_LOCKING in comments to reflect reality.
        rcu: ignore offline CPUs in last non-dyntick-idle CPU check
        ...
      f262af3d
    • Linus Torvalds's avatar
      Merge branch 'core-locking-for-linus' of... · 1014cfe2
      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: Reduce stack_trace usage
        lockdep: No need to disable preemption in debug atomic ops
        lockdep: Actually _dec_ in debug_atomic_dec
        lockdep: Provide off case for redundant_hardirqs_on increment
        lockdep: Simplify debug atomic ops
        lockdep: Fix redundant_hardirqs_on incremented with irqs enabled
        lockstat: Make lockstat counting per cpu
        i8253: Convert i8253_lock to raw_spinlock
      1014cfe2
    • Linus Torvalds's avatar
      Merge branch 'core-iommu-for-linus' of... · 8123d8f1
      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/amd-iommu: Add amd_iommu=off command line option
        iommu-api: Remove iommu_{un}map_range functions
        x86/amd-iommu: Implement ->{un}map callbacks for iommu-api
        x86/amd-iommu: Make amd_iommu_iova_to_phys aware of multiple page sizes
        x86/amd-iommu: Make iommu_unmap_page and fetch_pte aware of page sizes
        x86/amd-iommu: Make iommu_map_page and alloc_pte aware of page sizes
        kvm: Change kvm_iommu_map_pages to map large pages
        VT-d: Change {un}map_range functions to implement {un}map interface
        iommu-api: Add ->{un}map callbacks to iommu_ops
        iommu-api: Add iommu_map and iommu_unmap functions
        iommu-api: Rename ->{un}map function pointers to ->{un}map_range
      8123d8f1
    • Linus Torvalds's avatar
      Merge branch 'core-debugobjects-for-linus' of... · 06ee7720
      Linus Torvalds authored
      Merge branch 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-debugobjects-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        debugobjects: Section mismatch cleanup
      06ee7720
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · fd25a1f5
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (23 commits)
        cifs: fix noserverino handling when unix extensions are enabled
        cifs: don't update uniqueid in cifs_fattr_to_inode
        cifs: always revalidate hardlinked inodes when using noserverino
        [CIFS] drop quota operation stubs
        cifs: propagate cifs_new_fileinfo() error back to the caller
        cifs: add comments explaining cifs_new_fileinfo behavior
        cifs: remove unused parameter from cifs_posix_open_inode_helper()
        [CIFS] Remove unused cifs_oplock_cachep
        cifs: have decode_negTokenInit set flags in server struct
        cifs: break negotiate protocol calls out of cifs_setup_session
        cifs: eliminate "first_time" parm to CIFS_SessSetup
        [CIFS] Fix lease break for writes
        cifs: save the dialect chosen by server
        cifs: change && to ||
        cifs: rename "extended_security" to "global_secflags"
        cifs: move tcon find/create into separate function
        cifs: move SMB session creation code into separate function
        cifs: track local_nls in volume info
        [CIFS] Allow null nd (as nfs server uses) on create
        [CIFS] Fix losing locks during fork()
        ...
      fd25a1f5
  2. 17 May, 2010 27 commits