[prev in list] [next in list] [prev in thread] [next in thread]
List: linux-mips-cvs
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
From: linux-mips () linux-mips ! org
Date: 2013-02-21 10:19:47
Message-ID: S6827566Ab3BUKTuYqGnK/20130221101950Z+1154 () eddie ! linux-mips ! org
[Download RAW message or body]
Author: Ralf Baechle <ralf@linux-mips.org> Wed Feb 20 15:19:39 2013 +0100
Commit: a17565a4bd7018b5aa89825cfb30171e127d419e
Gitweb: http://git.linux-mips.org/g/ralf/linux/a17565a4bd70
Branch: master
---
.../testing/sysfs-bus-event_source-devices-events | 62 +
Documentation/ABI/testing/sysfs-platform-ts5500 | 47 +
Documentation/PCI/MSI-HOWTO.txt | 37
Documentation/atomic_ops.txt | 2
Documentation/memory-barriers.txt | 1
Documentation/trace/ftrace.txt | 83 +
MAINTAINERS | 7
Makefile | 3
arch/Kconfig | 12
arch/alpha/Kconfig | 1
arch/alpha/kernel/osf_sys.c | 6
arch/arm/Kconfig | 1
arch/arm64/Kconfig | 1
arch/blackfin/Kconfig | 2
arch/frv/Kconfig | 1
arch/hexagon/Kconfig | 2
arch/ia64/Kconfig | 1
arch/ia64/include/asm/cputime.h | 92 -
arch/ia64/include/asm/thread_info.h | 4
arch/ia64/include/asm/xen/minstate.h | 2
arch/ia64/kernel/asm-offsets.c | 2
arch/ia64/kernel/entry.S | 16
arch/ia64/kernel/fsys.S | 4
arch/ia64/kernel/head.S | 4
arch/ia64/kernel/ivt.S | 8
arch/ia64/kernel/minstate.h | 2
arch/ia64/kernel/time.c | 5
arch/mips/Kconfig | 2
arch/parisc/Kconfig | 2
arch/powerpc/Kconfig | 2
arch/powerpc/configs/chroma_defconfig | 2
arch/powerpc/configs/corenet64_smp_defconfig | 2
arch/powerpc/configs/pasemi_defconfig | 2
arch/powerpc/include/asm/cputime.h | 6
arch/powerpc/include/asm/lppaca.h | 2
arch/powerpc/include/asm/perf_event_server.h | 26
arch/powerpc/include/asm/ppc_asm.h | 4
arch/powerpc/kernel/entry_64.S | 4
arch/powerpc/kernel/time.c | 7
arch/powerpc/perf/core-book3s.c | 12
arch/powerpc/perf/power7-pmu.c | 80 +
arch/powerpc/platforms/cell/spufs/sched.c | 1
arch/powerpc/platforms/pseries/dtl.c | 6
arch/powerpc/platforms/pseries/setup.c | 6
arch/s390/Kconfig | 1
arch/s390/kernel/vtime.c | 6
arch/sh/Kconfig | 4
arch/sparc/Kconfig | 1
arch/x86/Kconfig | 28
arch/x86/Makefile | 4
arch/x86/boot/compressed/misc.c | 2
arch/x86/boot/compressed/misc.h | 1
arch/x86/configs/i386_defconfig | 1
arch/x86/include/asm/amd_nb.h | 17
arch/x86/include/asm/bootparam_utils.h | 38
arch/x86/include/asm/cpufeature.h | 2
arch/x86/include/asm/ftrace.h | 1
arch/x86/include/asm/hpet.h | 5
arch/x86/include/asm/hw_irq.h | 13
arch/x86/include/asm/hypervisor.h | 13
arch/x86/include/asm/io_apic.h | 28
arch/x86/include/asm/irq_remapping.h | 40
arch/x86/include/asm/irq_vectors.h | 4
arch/x86/include/asm/kvm_para.h | 8
arch/x86/include/asm/linkage.h | 18
arch/x86/include/asm/mshyperv.h | 4
arch/x86/include/asm/pci.h | 3
arch/x86/include/asm/perf_event.h | 13
arch/x86/include/asm/pgtable.h | 12
arch/x86/include/asm/pgtable_32.h | 7
arch/x86/include/asm/pgtable_64.h | 3
arch/x86/include/asm/processor.h | 2
arch/x86/include/asm/required-features.h | 8
arch/x86/include/asm/uv/uv_hub.h | 44 -
arch/x86/include/asm/uv/uv_mmrs.h | 1496 +++++++++++++----
arch/x86/include/asm/x86_init.h | 27
arch/x86/include/asm/xor.h | 491 ++++++
arch/x86/include/asm/xor_32.h | 309 ----
arch/x86/include/asm/xor_64.h | 305 ----
arch/x86/include/uapi/asm/msr-index.h | 2
arch/x86/kernel/Makefile | 3
arch/x86/kernel/apb_timer.c | 10
arch/x86/kernel/apic/apic.c | 28
arch/x86/kernel/apic/io_apic.c | 457 ++---
arch/x86/kernel/apic/ipi.c | 2
arch/x86/kernel/apic/x2apic_uv_x.c | 206 ++
arch/x86/kernel/apm_32.c | 11
arch/x86/kernel/cpu/amd.c | 4
arch/x86/kernel/cpu/hypervisor.c | 7
arch/x86/kernel/cpu/intel_cacheinfo.c | 2
arch/x86/kernel/cpu/mcheck/mce.c | 14
arch/x86/kernel/cpu/mshyperv.c | 54 +
arch/x86/kernel/cpu/perf_event.c | 15
arch/x86/kernel/cpu/perf_event.h | 25
arch/x86/kernel/cpu/perf_event_amd.c | 322 +++-
arch/x86/kernel/cpu/vmware.c | 13
arch/x86/kernel/entry_32.S | 9
arch/x86/kernel/entry_64.S | 7
arch/x86/kernel/head32.c | 3
arch/x86/kernel/head64.c | 2
arch/x86/kernel/head_32.S | 93 -
arch/x86/kernel/hpet.c | 2
arch/x86/kernel/kprobes-common.h | 102 -
arch/x86/kernel/kprobes-opt.c | 512 ------
arch/x86/kernel/kprobes.c | 1130 -------------
arch/x86/kernel/kprobes/Makefile | 7
arch/x86/kernel/kprobes/common.h | 113 +
arch/x86/kernel/kprobes/core.c | 1064 ++++++++++++
arch/x86/kernel/kprobes/ftrace.c | 93 +
arch/x86/kernel/kprobes/opt.c | 512 ++++++
arch/x86/kernel/kvm.c | 1
arch/x86/kernel/ptrace.c | 2
arch/x86/kernel/rtc.c | 1
arch/x86/kernel/sys_x86_64.c | 2
arch/x86/kernel/tsc.c | 3
arch/x86/kernel/uprobes.c | 4
arch/x86/kernel/x86_init.c | 24
arch/x86/mm/init_64.c | 4
arch/x86/mm/memtest.c | 10
arch/x86/mm/srat.c | 29
arch/x86/mm/tlb.c | 2
arch/x86/pci/mmconfig-shared.c | 3
arch/x86/platform/Makefile | 2
arch/x86/platform/efi/efi-bgrt.c | 7
arch/x86/platform/goldfish/Makefile | 1
arch/x86/platform/goldfish/goldfish.c | 51 +
arch/x86/platform/sfi/sfi.c | 2
arch/x86/platform/ts5500/Makefile | 1
arch/x86/platform/ts5500/ts5500.c | 339 ++++
arch/x86/platform/uv/tlb_uv.c | 4
arch/x86/platform/uv/uv_time.c | 13
arch/x86/um/fault.c | 2
arch/x86/vdso/vclock_gettime.c | 2
arch/x86/xen/enlighten.c | 1
block/blk-exec.c | 1
block/elevator.c | 35
drivers/acpi/apei/cper.c | 19
drivers/ata/ahci.c | 93 +
drivers/ata/ahci.h | 6
drivers/ata/libahci.c | 118 +
drivers/edac/amd64_edac.c | 109 +
drivers/edac/amd64_edac.h | 12
drivers/hv/Kconfig | 2
drivers/iommu/amd_iommu.c | 8
drivers/iommu/dmar.c | 2
drivers/iommu/intel-iommu.c | 2
drivers/iommu/intel_irq_remapping.c | 48 -
drivers/iommu/irq_remapping.c | 231 +++
drivers/iommu/irq_remapping.h | 1
drivers/isdn/mISDN/stack.c | 7
drivers/misc/sgi-gru/grufile.c | 2
drivers/net/can/sja1000/peak_pci.c | 3
drivers/net/wimax/i2400m/netdev.c | 31
drivers/net/wireless/ipw2x00/ipw2100.c | 31
drivers/net/wireless/ipw2x00/ipw2100.h | 3
drivers/net/wireless/ipw2x00/ipw2200.c | 13
drivers/net/wireless/mwifiex/sdio.c | 9
drivers/net/wireless/ti/wl1251/ps.c | 3
drivers/pci/msi.c | 26
drivers/pci/pcie/aer/aerdrv_errprint.c | 63 -
drivers/platform/x86/thinkpad_acpi.c | 3
drivers/rtc/Kconfig | 12
drivers/rtc/Makefile | 1
drivers/rtc/class.c | 7
drivers/rtc/systohc.c | 44 +
drivers/spi/spi.c | 2
drivers/staging/csr/bh.c | 2
drivers/staging/csr/unifi_sme.c | 2
drivers/staging/iio/trigger/Kconfig | 1
drivers/tty/serial/max3100.c | 3
drivers/tty/sysrq.c | 1
drivers/video/exynos/exynos_dp_core.c | 6
drivers/xen/events.c | 7
fs/binfmt_elf.c | 8
fs/binfmt_elf_fdpic.c | 7
fs/proc/array.c | 4
fs/pstore/ram.c | 10
fs/select.c | 1
include/asm-generic/cputime.h | 66 -
include/asm-generic/cputime_jiffies.h | 72 +
include/asm-generic/cputime_nsecs.h | 104 +
include/linux/aer.h | 4
include/linux/async.h | 10
include/linux/clockchips.h | 9
include/linux/context_tracking.h | 28
include/linux/elevator.h | 5
include/linux/ftrace.h | 6
include/linux/ftrace_event.h | 6
include/linux/hardirq.h | 8
include/linux/init.h | 1
include/linux/init_task.h | 12
include/linux/irq.h | 8
include/linux/irq_work.h | 22
include/linux/kernel_stat.h | 2
include/linux/kprobes.h | 12
include/linux/kvm_host.h | 55 +
include/linux/pci.h | 7
include/linux/perf_event.h | 20
include/linux/printk.h | 3
include/linux/profile.h | 13
include/linux/rcupdate.h | 15
include/linux/ring_buffer.h | 1
include/linux/rtc.h | 1
include/linux/sched.h | 185 --
include/linux/sched/rt.h | 58 +
include/linux/sched/sysctl.h | 110 +
include/linux/smpboot.h | 5
include/linux/srcu.h | 26
include/linux/tick.h | 17
include/linux/time.h | 13
include/linux/tsacct_kern.h | 3
include/linux/uprobes.h | 23
include/linux/vtime.h | 59 -
include/linux/workqueue.h | 35
include/trace/events/ras.h | 77 +
include/trace/events/rcu.h | 31
include/trace/events/workqueue.h | 10
include/uapi/linux/perf_event.h | 3
init/Kconfig | 42
init/do_mounts_initrd.c | 3
init/init_task.c | 2
init/initramfs.c | 8
init/main.c | 16
kernel/acct.c | 6
kernel/async.c | 167 +-
kernel/context_tracking.c | 114 +
kernel/cpu.c | 6
kernel/delayacct.c | 7
kernel/events/core.c | 5
kernel/events/hw_breakpoint.c | 2
kernel/events/uprobes.c | 466 +++--
kernel/exit.c | 10
kernel/fork.c | 6
kernel/futex.c | 1
kernel/hrtimer.c | 38
kernel/irq/chip.c | 30
kernel/irq/manage.c | 3
kernel/irq/spurious.c | 7
kernel/irq_work.c | 150 +-
kernel/kmod.c | 9
kernel/kprobes.c | 31
kernel/mutex.c | 1
kernel/posix-cpu-timers.c | 51 -
kernel/posix-timers.c | 2
kernel/printk.c | 36
kernel/profile.c | 24
kernel/ptrace.c | 6
kernel/rcu.h | 7
kernel/rcupdate.c | 60 +
kernel/rcutiny.c | 8
kernel/rcutiny_plugin.h | 56 +
kernel/rcutorture.c | 66 +
kernel/rcutree.c | 260 ++-
kernel/rcutree.h | 11
kernel/rtmutex-debug.c | 1
kernel/rtmutex-tester.c | 1
kernel/rtmutex.c | 1
kernel/sched/core.c | 24
kernel/sched/cpupri.c | 2
kernel/sched/cputime.c | 314 +++-
kernel/sched/fair.c | 27
kernel/sched/rt.c | 26
kernel/sched/sched.h | 2
kernel/signal.c | 12
kernel/smpboot.c | 5
kernel/softirq.c | 6
kernel/srcu.c | 37
kernel/stop_machine.c | 156 +-
kernel/sysctl.c | 8
kernel/time.c | 8
kernel/time/Kconfig | 9
kernel/time/ntp.c | 22
kernel/time/tick-broadcast.c | 38
kernel/time/tick-sched.c | 12
kernel/time/timekeeping.c | 45 -
kernel/timeconst.pl | 6
kernel/timer.c | 2
kernel/trace/Kconfig | 18
kernel/trace/blktrace.c | 2
kernel/trace/ftrace.c | 88 +
kernel/trace/ring_buffer.c | 108 +
kernel/trace/trace.c | 253 ++-
kernel/trace/trace.h | 134 +-
kernel/trace/trace_clock.c | 5
kernel/trace/trace_events.c | 1
kernel/trace/trace_functions.c | 61 -
kernel/trace/trace_functions_graph.c | 68 +
kernel/trace/trace_probe.h | 1
kernel/trace/trace_sched_wakeup.c | 2
kernel/trace/trace_selftest.c | 21
kernel/trace/trace_syscalls.c | 18
kernel/trace/trace_uprobe.c | 217 ++-
kernel/tsacct.c | 44 -
kernel/watchdog.c | 1
kernel/workqueue.c | 1530 ++++++++----------
kernel/workqueue_internal.h | 65 +
kernel/workqueue_sched.h | 9
lib/Kconfig.debug | 117 +
mm/mmap.c | 1
mm/mremap.c | 1
mm/nommu.c | 1
mm/page-writeback.c | 1
mm/page_alloc.c | 1
net/rfkill/input.c | 8
samples/Kconfig | 6
samples/Makefile | 2
samples/tracepoints/Makefile | 6
samples/tracepoints/tp-samples-trace.h | 11
samples/tracepoints/tracepoint-probe-sample.c | 57 -
samples/tracepoints/tracepoint-probe-sample2.c | 44 -
samples/tracepoints/tracepoint-sample.c | 57 -
tools/Makefile | 2
tools/lib/traceevent/event-parse.c | 49 -
tools/lib/traceevent/event-parse.h | 3
tools/lib/traceevent/event-utils.h | 3
tools/lib/traceevent/parse-filter.c | 3
tools/lib/traceevent/parse-utils.c | 19
tools/lib/traceevent/trace-seq.c | 3
tools/perf/Documentation/Makefile | 4
tools/perf/Documentation/perf-annotate.txt | 7
tools/perf/Documentation/perf-buildid-cache.txt | 7
tools/perf/Documentation/perf-diff.txt | 4
tools/perf/Documentation/perf-evlist.txt | 4
tools/perf/Documentation/perf-report.txt | 41
tools/perf/Documentation/perf-script-python.txt | 2
tools/perf/Documentation/perf-stat.txt | 11
tools/perf/Documentation/perf-test.txt | 4
tools/perf/Documentation/perf-top.txt | 2
tools/perf/Makefile | 104 +
tools/perf/arch/common.c | 1
tools/perf/bench/bench.h | 1
tools/perf/bench/numa.c | 1731 ++++++++++++++++++++
tools/perf/builtin-annotate.c | 30
tools/perf/builtin-bench.c | 19
tools/perf/builtin-buildid-cache.c | 96 +
tools/perf/builtin-buildid-list.c | 21
tools/perf/builtin-diff.c | 205 +-
tools/perf/builtin-evlist.c | 88 -
tools/perf/builtin-kmem.c | 16
tools/perf/builtin-kvm.c | 3
tools/perf/builtin-record.c | 168 --
tools/perf/builtin-report.c | 93 +
tools/perf/builtin-sched.c | 6
tools/perf/builtin-script.c | 17
tools/perf/builtin-stat.c | 328 +++-
tools/perf/builtin-top.c | 372 +---
tools/perf/builtin-trace.c | 2
tools/perf/config/feature-tests.mak | 11
tools/perf/config/utilities.mak | 6
tools/perf/perf.c | 32
tools/perf/perf.h | 32
tools/perf/scripts/perl/bin/workqueue-stats-record | 2
tools/perf/scripts/perl/bin/workqueue-stats-report | 3
tools/perf/scripts/perl/rwtop.pl | 6
tools/perf/scripts/perl/workqueue-stats.pl | 129 -
tools/perf/tests/attr.c | 9
tools/perf/tests/attr.py | 27
tools/perf/tests/attr/base-record | 2
tools/perf/tests/attr/test-record-group | 2
tools/perf/tests/attr/test-record-group1 | 4
tools/perf/tests/builtin-test.c | 40
tools/perf/tests/evsel-roundtrip-name.c | 4
tools/perf/tests/hists_link.c | 500 ++++++
tools/perf/tests/mmap-basic.c | 40
tools/perf/tests/open-syscall-all-cpus.c | 19
tools/perf/tests/open-syscall.c | 17
tools/perf/tests/parse-events.c | 324 +++-
tools/perf/tests/perf-record.c | 20
tools/perf/tests/pmu.c | 11
tools/perf/tests/python-use.c | 23
tools/perf/tests/tests.h | 11
tools/perf/tests/util.c | 30
tools/perf/tests/vmlinux-kallsyms.c | 7
tools/perf/ui/browser.c | 6
tools/perf/ui/browsers/annotate.c | 33
tools/perf/ui/browsers/hists.c | 341 +++-
tools/perf/ui/gtk/annotate.c | 229 +++
tools/perf/ui/gtk/browser.c | 235 ---
tools/perf/ui/gtk/gtk.h | 10
tools/perf/ui/gtk/helpline.c | 23
tools/perf/ui/gtk/hists.c | 312 ++++
tools/perf/ui/helpline.c | 12
tools/perf/ui/helpline.h | 22
tools/perf/ui/hist.c | 481 +++---
tools/perf/ui/keysyms.h | 1
tools/perf/ui/setup.c | 3
tools/perf/ui/stdio/hist.c | 25
tools/perf/ui/tui/helpline.c | 29
tools/perf/ui/util.c | 1
tools/perf/util/PERF-VERSION-GEN | 4
tools/perf/util/annotate.c | 2
tools/perf/util/annotate.h | 24
tools/perf/util/callchain.c | 2
tools/perf/util/callchain.h | 5
tools/perf/util/cpumap.c | 54 +
tools/perf/util/cpumap.h | 9
tools/perf/util/debug.c | 28
tools/perf/util/debug.h | 34
tools/perf/util/dso.c | 6
tools/perf/util/dso.h | 2
tools/perf/util/event.c | 4
tools/perf/util/evlist.c | 31
tools/perf/util/evlist.h | 34
tools/perf/util/evsel.c | 370 ++++
tools/perf/util/evsel.h | 50 +
tools/perf/util/header.c | 266 +++
tools/perf/util/header.h | 2
tools/perf/util/hist.c | 142 +-
tools/perf/util/hist.h | 26
tools/perf/util/include/linux/bitops.h | 1
tools/perf/util/intlist.c | 36
tools/perf/util/intlist.h | 2
tools/perf/util/machine.c | 784 +++++++++
tools/perf/util/machine.h | 41
tools/perf/util/map.c | 121 +
tools/perf/util/map.h | 24
tools/perf/util/parse-events.c | 96 +
tools/perf/util/parse-events.h | 22
tools/perf/util/parse-events.y | 75 -
tools/perf/util/pmu.c | 46 -
tools/perf/util/pmu.h | 15
tools/perf/util/pmu.y | 1
tools/perf/util/probe-finder.c | 10
tools/perf/util/python-ext-sources | 1
tools/perf/util/python.c | 9
.../perf/util/scripting-engines/trace-event-perl.c | 1
.../util/scripting-engines/trace-event-python.c | 1
tools/perf/util/session.c | 325 +---
tools/perf/util/session.h | 35
tools/perf/util/sort.c | 245 +--
tools/perf/util/sort.h | 15
tools/perf/util/string.c | 18
tools/perf/util/strlist.c | 54 -
tools/perf/util/strlist.h | 42
tools/perf/util/symbol-elf.c | 14
tools/perf/util/symbol-minimal.c | 1
tools/perf/util/symbol.c | 536 ------
tools/perf/util/symbol.h | 9
tools/perf/util/sysfs.c | 2
tools/perf/util/thread.c | 20
tools/perf/util/thread.h | 1
tools/perf/util/top.c | 22
tools/perf/util/top.h | 10
tools/perf/util/util.c | 24
tools/perf/util/util.h | 4
445 files changed, 17378 insertions(+), 9374 deletions(-)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic