Merge commit 'tip/perfcounters-for-linus' into oprofile/master

Conflicts: arch/x86/oprofile/op_model_ppro.c Signed-off-by: Robert Richter <robert.richter@amd.com>
2026-09-26 18:16:26 +00:00 · 2009-06-12 17:58:48 +02:00 · 2009-06-12 17:58:48 +02:00 · 1241eb8f13
commit 1241eb8f13
parent 51563a0e56 940010c5a3
509 changed files with 45275 additions and 8841 deletions
--- a/Documentation/ABI/testing/sysfs-devices-cache_disable
+++ b/Documentation/ABI/testing/sysfs-devices-cache_disable
--- a/Documentation/DMA-API.txt
+++ b/Documentation/DMA-API.txt
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
--- a/Documentation/DocBook/tracepoint.tmpl
+++ b/Documentation/DocBook/tracepoint.tmpl
--- a/Documentation/RCU/trace.txt
+++ b/Documentation/RCU/trace.txt
--- a/Documentation/futex-requeue-pi.txt
+++ b/Documentation/futex-requeue-pi.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/memory-barriers.txt
+++ b/Documentation/memory-barriers.txt
--- a/Documentation/scheduler/sched-rt-group.txt
+++ b/Documentation/scheduler/sched-rt-group.txt
--- a/Documentation/trace/events.txt
+++ b/Documentation/trace/events.txt
--- a/Documentation/trace/ftrace.txt
+++ b/Documentation/trace/ftrace.txt
--- a/Documentation/trace/power.txt
+++ b/Documentation/trace/power.txt
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
--- a/Documentation/x86/x86_64/boot-options.txt
+++ b/Documentation/x86/x86_64/boot-options.txt
--- a/Documentation/x86/x86_64/mm.txt
+++ b/Documentation/x86/x86_64/mm.txt
--- a/10
+++ b/10
--- a/arch/alpha/kernel/sys_dp264.c
+++ b/arch/alpha/kernel/sys_dp264.c
--- a/arch/alpha/kernel/sys_titan.c
+++ b/arch/alpha/kernel/sys_titan.c
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
--- a/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
--- a/arch/ia64/hp/sim/hpsim_irq.c
+++ b/arch/ia64/hp/sim/hpsim_irq.c
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
--- a/arch/ia64/kernel/msi_ia64.c
+++ b/arch/ia64/kernel/msi_ia64.c
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
--- a/arch/ia64/sn/kernel/msi_sn.c
+++ b/arch/ia64/sn/kernel/msi_sn.c
--- a/arch/mips/cavium-octeon/octeon-irq.c
+++ b/arch/mips/cavium-octeon/octeon-irq.c
--- a/arch/mips/include/asm/irq.h
+++ b/arch/mips/include/asm/irq.h
--- a/arch/mips/kernel/irq-gic.c
+++ b/arch/mips/kernel/irq-gic.c
--- a/arch/mips/mti-malta/malta-smtc.c
+++ b/arch/mips/mti-malta/malta-smtc.c
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
--- a/arch/powerpc/include/asm/perf_counter.h
+++ b/arch/powerpc/include/asm/perf_counter.h
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
--- a/arch/powerpc/include/asm/systbl.h
+++ b/arch/powerpc/include/asm/systbl.h
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
--- a/arch/powerpc/kernel/perf_counter.c
+++ b/arch/powerpc/kernel/perf_counter.c
--- a/arch/powerpc/kernel/power4-pmu.c
+++ b/arch/powerpc/kernel/power4-pmu.c
--- a/arch/powerpc/kernel/power5+-pmu.c
+++ b/arch/powerpc/kernel/power5+-pmu.c
--- a/arch/powerpc/kernel/power5-pmu.c
+++ b/arch/powerpc/kernel/power5-pmu.c
--- a/arch/powerpc/kernel/power6-pmu.c
+++ b/arch/powerpc/kernel/power6-pmu.c
--- a/arch/powerpc/kernel/power7-pmu.c
+++ b/arch/powerpc/kernel/power7-pmu.c
--- a/arch/powerpc/kernel/ppc970-pmu.c
+++ b/arch/powerpc/kernel/ppc970-pmu.c
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
--- a/arch/powerpc/sysdev/mpic.h
+++ b/arch/powerpc/sysdev/mpic.h
--- a/arch/sparc/include/asm/thread_info_64.h
+++ b/arch/sparc/include/asm/thread_info_64.h
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
--- a/arch/x86/Kbuild
+++ b/arch/x86/Kbuild
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
--- a/arch/x86/boot/.gitignore
+++ b/arch/x86/boot/.gitignore
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
--- a/arch/x86/boot/a20.c
+++ b/arch/x86/boot/a20.c
--- a/arch/x86/boot/apm.c
+++ b/arch/x86/boot/apm.c
--- a/arch/x86/boot/bioscall.S
+++ b/arch/x86/boot/bioscall.S
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
--- a/arch/x86/boot/compressed/.gitignore
+++ b/arch/x86/boot/compressed/.gitignore
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
--- a/arch/x86/boot/compressed/mkpiggy.c
+++ b/arch/x86/boot/compressed/mkpiggy.c
--- a/arch/x86/boot/compressed/vmlinux_64.lds
+++ b/arch/x86/boot/compressed/vmlinux_64.lds
--- a/arch/x86/boot/compressed/vmlinux.scr
+++ b/arch/x86/boot/compressed/vmlinux.scr
--- a/arch/x86/boot/compressed/vmlinux_32.lds
+++ b/arch/x86/boot/compressed/vmlinux_32.lds
--- a/arch/x86/boot/edd.c
+++ b/arch/x86/boot/edd.c
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
--- a/arch/x86/boot/main.c
+++ b/arch/x86/boot/main.c
--- a/arch/x86/boot/mca.c
+++ b/arch/x86/boot/mca.c
--- a/arch/x86/boot/memory.c
+++ b/arch/x86/boot/memory.c
--- a/arch/x86/boot/regs.c
+++ b/arch/x86/boot/regs.c
--- a/arch/x86/boot/setup.ld
+++ b/arch/x86/boot/setup.ld
--- a/arch/x86/boot/tty.c
+++ b/arch/x86/boot/tty.c
--- a/arch/x86/boot/video-bios.c
+++ b/arch/x86/boot/video-bios.c
--- a/arch/x86/boot/video-vesa.c
+++ b/arch/x86/boot/video-vesa.c
--- a/arch/x86/boot/video-vga.c
+++ b/arch/x86/boot/video-vga.c
--- a/arch/x86/boot/video.c
+++ b/arch/x86/boot/video.c
--- a/arch/x86/boot/video.h
+++ b/arch/x86/boot/video.h
--- a/arch/x86/configs/i386_defconfig
+++ b/arch/x86/configs/i386_defconfig
--- a/arch/x86/configs/x86_64_defconfig
+++ b/arch/x86/configs/x86_64_defconfig
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
--- a/arch/x86/include/asm/amd_iommu.h
+++ b/arch/x86/include/asm/amd_iommu.h
--- a/arch/x86/include/asm/amd_iommu_types.h
+++ b/arch/x86/include/asm/amd_iommu_types.h
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
--- a/arch/x86/include/asm/apicdef.h
+++ b/arch/x86/include/asm/apicdef.h
--- a/arch/x86/include/asm/atomic_32.h
+++ b/arch/x86/include/asm/atomic_32.h
--- a/arch/x86/include/asm/boot.h
+++ b/arch/x86/include/asm/boot.h
--- a/arch/x86/include/asm/bootparam.h
+++ b/arch/x86/include/asm/bootparam.h
--- a/Show more
+++ b/Show more