--- linux-2.6.31.perfctr26/CREDITS.~1~	2009-09-10 13:41:49.000000000 +0200
+++ linux-2.6.31.perfctr26/CREDITS	2009-09-10 14:12:53.000000000 +0200
@@ -2771,6 +2771,7 @@ N: Mikael Pettersson
 E: mikpe@it.uu.se
 W: http://user.it.uu.se/~mikpe/linux/
 D: Miscellaneous fixes
+D: Performance-monitoring counters driver
 
 N: Reed H. Petty
 E: rhp@draper.net
--- linux-2.6.31.perfctr26/Documentation/ioctl/ioctl-number.txt.~1~	2009-09-10 13:41:49.000000000 +0200
+++ linux-2.6.31.perfctr26/Documentation/ioctl/ioctl-number.txt	2009-09-10 14:12:53.000000000 +0200
@@ -198,6 +198,8 @@ Code	Seq#	Include File		Comments
 0xB1	00-1F	PPPoX			<mailto:mostrows@styx.uwaterloo.ca>
 0xCB	00-1F	CBM serial IEC bus	in development:
 					<mailto:michael.klein@puffin.lb.shuttle.de>
+0xD0	all	performance counters	see drivers/perfctr/
+					<mailto:mikpe@it.uu.se>
 0xDD	00-3F	ZFCP device driver	see drivers/s390/scsi/
 					<mailto:aherrman@de.ibm.com>
 0xF3	00-3F	video/sisfb.h		sisfb (in development)
--- linux-2.6.31.perfctr26/MAINTAINERS.~1~	2009-09-10 13:41:49.000000000 +0200
+++ linux-2.6.31.perfctr26/MAINTAINERS	2009-09-10 14:12:53.000000000 +0200
@@ -3951,6 +3951,11 @@ M:	Paul Mackerras <paulus@samba.org>
 M:	Ingo Molnar <mingo@elte.hu>
 S:	Supported
 
+PERFORMANCE-MONITORING COUNTERS DRIVER
+M:	Mikael Pettersson <mikpe@it.uu.se>
+W:	http://user.it.uu.se/~mikpe/linux/perfctr/
+S:	Maintained
+
 PERSONALITY HANDLING
 M:	Christoph Hellwig <hch@infradead.org>
 L:	linux-abi-devel@lists.sourceforge.net
--- linux-2.6.31.perfctr26/arch/arm/Kconfig.~1~	2009-09-10 13:41:49.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/arm/Kconfig	2009-09-10 14:12:53.000000000 +0200
@@ -753,6 +753,10 @@ config IWMMXT
 	  Enable support for iWMMXt context switching at run time if
 	  running on a CPU that supports it.
 
+if CPU_XSCALE
+source drivers/perfctr/Kconfig
+endif
+
 #  bool 'Use XScale PMU as timer source' CONFIG_XSCALE_PMU_TIMER
 config XSCALE_PMU
 	bool
--- linux-2.6.31.perfctr26/arch/arm/include/asm/processor.h.~1~	2009-09-10 13:41:49.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/arm/include/asm/processor.h	2009-09-10 14:12:53.000000000 +0200
@@ -50,6 +50,10 @@ struct thread_struct {
 	unsigned long		error_code;
 							/* debugging	  */
 	struct debug_info	debug;
+
+#ifdef CONFIG_PERFCTR_VIRTUAL
+	struct vperfctr		*perfctr;		/* performance counters */
+#endif
 };
 
 #define INIT_THREAD  {	}
--- linux-2.6.31.perfctr26/arch/arm/include/asm/system.h.~1~	2009-06-10 12:00:43.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/arm/include/asm/system.h	2009-09-10 14:12:53.000000000 +0200
@@ -215,7 +215,9 @@ extern struct task_struct *__switch_to(s
 
 #define switch_to(prev,next,last)					\
 do {									\
+	perfctr_suspend_thread(&(prev)->thread);			\
 	last = __switch_to(prev,task_thread_info(prev), task_thread_info(next));	\
+	perfctr_resume_thread(&(current)->thread);			\
 } while (0)
 
 #if defined(CONFIG_CPU_SA1100) || defined(CONFIG_CPU_SA110)
--- linux-2.6.31.perfctr26/arch/arm/kernel/process.c.~1~	2009-09-10 13:41:49.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/arm/kernel/process.c	2009-09-10 14:12:53.000000000 +0200
@@ -26,6 +26,7 @@
 #include <linux/cpu.h>
 #include <linux/elfcore.h>
 #include <linux/pm.h>
+#include <linux/perfctr.h>
 #include <linux/tick.h>
 #include <linux/utsname.h>
 #include <linux/uaccess.h>
@@ -279,6 +280,7 @@ void show_regs(struct pt_regs * regs)
  */
 void exit_thread(void)
 {
+	perfctr_exit_thread(&current->thread);
 }
 
 ATOMIC_NOTIFIER_HEAD(thread_notify_head);
@@ -324,6 +326,8 @@ copy_thread(unsigned long clone_flags, u
 	if (clone_flags & CLONE_SETTLS)
 		thread->tp_value = regs->ARM_r3;
 
+	perfctr_copy_task(p, regs);
+
 	return 0;
 }
 
--- linux-2.6.31.perfctr26/arch/powerpc/include/asm/processor.h.~1~	2009-06-10 12:00:43.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/powerpc/include/asm/processor.h	2009-09-10 14:12:53.000000000 +0200
@@ -197,6 +197,9 @@ struct thread_struct {
 	unsigned long	spefscr;	/* SPE & eFP status */
 	int		used_spe;	/* set if process has used spe */
 #endif /* CONFIG_SPE */
+#ifdef CONFIG_PERFCTR_VIRTUAL
+	struct vperfctr *perfctr;	/* performance counters */
+#endif
 };
 
 #define ARCH_MIN_TASKALIGN 16
--- linux-2.6.31.perfctr26/arch/powerpc/kernel/process.c.~1~	2009-09-10 13:41:50.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/powerpc/kernel/process.c	2009-09-10 14:12:53.000000000 +0200
@@ -30,6 +30,7 @@
 #include <linux/init_task.h>
 #include <linux/module.h>
 #include <linux/kallsyms.h>
+#include <linux/perfctr.h>
 #include <linux/mqueue.h>
 #include <linux/hardirq.h>
 #include <linux/utsname.h>
@@ -409,8 +410,10 @@ struct task_struct *__switch_to(struct t
 	 * window where the kernel stack SLB and the kernel stack are out
 	 * of sync. Hard disable here.
 	 */
+	perfctr_suspend_thread(&prev->thread);
 	hard_irq_disable();
 	last = _switch(old_thread, new_thread);
+	perfctr_resume_thread(&current->thread);
 
 	local_irq_restore(flags);
 
@@ -550,6 +553,7 @@ void show_regs(struct pt_regs * regs)
 void exit_thread(void)
 {
 	discard_lazy_cpu_state();
+	perfctr_exit_thread(&current->thread);
 }
 
 void flush_thread(void)
@@ -676,6 +680,8 @@ int copy_thread(unsigned long clone_flag
 	kregs->nip = (unsigned long)ret_from_fork;
 #endif
 
+	perfctr_copy_task(p, regs);
+
 	return 0;
 }
 
--- linux-2.6.31.perfctr26/arch/powerpc/platforms/Kconfig.cputype.~1~	2009-09-10 13:41:50.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/powerpc/platforms/Kconfig.cputype	2009-09-10 14:12:53.000000000 +0200
@@ -290,4 +290,8 @@ config NOT_COHERENT_CACHE
 config CHECK_CACHE_COHERENCY
 	bool
 
+if PPC32
+source "drivers/perfctr/Kconfig"
+endif
+
 endmenu
--- linux-2.6.31.perfctr26/arch/x86/Kconfig.~1~	2009-09-10 13:41:50.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/x86/Kconfig	2009-09-10 14:12:53.000000000 +0200
@@ -1464,6 +1464,8 @@ config CC_STACKPROTECTOR
 	  detected and for those versions, this configuration option is
 	  ignored. (and a warning is printed during bootup)
 
+source "drivers/perfctr/Kconfig"
+
 source kernel/Kconfig.hz
 
 config KEXEC
--- linux-2.6.31.perfctr26/arch/x86/include/asm/irq_vectors.h.~1~	2009-09-10 13:41:50.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/x86/include/asm/irq_vectors.h	2009-09-10 14:12:53.000000000 +0200
@@ -102,6 +102,7 @@
  * sources per level' errata.
  */
 #define LOCAL_TIMER_VECTOR		0xef
+#define LOCAL_PERFCTR_VECTOR		0xee
 
 /*
  * Generic system vector for platform specific use
@@ -121,7 +122,7 @@
 #define MCE_SELF_VECTOR			0xeb
 
 /*
- * First APIC vector available to drivers: (vectors 0x30-0xee) we
+ * First APIC vector available to drivers: (vectors 0x30-0xea) we
  * start at 0x31(0x41) to spread out vectors evenly between priority
  * levels. (0x80 is the syscall vector)
  */
--- linux-2.6.31.perfctr26/arch/x86/include/asm/processor.h.~1~	2009-09-10 13:41:50.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/x86/include/asm/processor.h	2009-09-10 14:12:53.000000000 +0200
@@ -460,6 +460,8 @@ struct thread_struct {
 	unsigned long		iopl;
 	/* Max allowed port in the bitmap, in bytes: */
 	unsigned		io_bitmap_max;
+/* performance counters */
+	struct vperfctr		*perfctr;
 /* MSR_IA32_DEBUGCTLMSR value to switch in if TIF_DEBUGCTLMSR is set.  */
 	unsigned long	debugctlmsr;
 	/* Debug Store context; see asm/ds.h */
--- linux-2.6.31.perfctr26/arch/x86/include/asm/system.h.~1~	2009-06-10 12:00:43.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/x86/include/asm/system.h	2009-09-10 14:12:53.000000000 +0200
@@ -55,6 +55,7 @@ do {									\
 	 */								\
 	unsigned long ebx, ecx, edx, esi, edi;				\
 									\
+	perfctr_suspend_thread(&(prev)->thread);			\
 	asm volatile("pushfl\n\t"		/* save    flags */	\
 		     "pushl %%ebp\n\t"		/* save    EBP   */	\
 		     "movl %%esp,%[prev_sp]\n\t"	/* save    ESP   */ \
@@ -123,7 +124,8 @@ do {									\
 #endif	/* CC_STACKPROTECTOR */
 
 /* Save restore flags to clear handle leaking NT */
-#define switch_to(prev, next, last) \
+#define switch_to(prev, next, last) do { \
+	perfctr_suspend_thread(&(prev)->thread); \
 	asm volatile(SAVE_CONTEXT					  \
 	     "movq %%rsp,%P[threadrsp](%[prev])\n\t" /* save RSP */	  \
 	     "movq %P[threadrsp](%[next]),%%rsp\n\t" /* restore RSP */	  \
@@ -146,7 +148,8 @@ do {									\
 	       [thread_info] "i" (offsetof(struct task_struct, stack)),   \
 	       [current_task] "m" (per_cpu_var(current_task))		  \
 	       __switch_canary_iparam					  \
-	     : "memory", "cc" __EXTRA_CLOBBER)
+	     : "memory", "cc" __EXTRA_CLOBBER); \
+} while (0)
 #endif
 
 #ifdef __KERNEL__
--- linux-2.6.31.perfctr26/arch/x86/kernel/entry_32.S.~1~	2009-09-10 13:41:50.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/x86/kernel/entry_32.S	2009-09-10 14:12:53.000000000 +0200
@@ -832,6 +832,23 @@ ENDPROC(name)
 /* The include is where all of the SMP etc. interrupts come from */
 #include <asm/entry_arch.h>
 
+#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_KPERFCTR)
+ENTRY(perfctr_interrupt)
+	RING0_INT_FRAME
+	pushl $~(LOCAL_PERFCTR_VECTOR)
+	CFI_ADJUST_CFA_OFFSET 4
+	SAVE_ALL
+	TRACE_IRQS_OFF
+	pushl %esp
+	CFI_ADJUST_CFA_OFFSET 4
+	call smp_perfctr_interrupt
+	addl $4, %esp
+	CFI_ADJUST_CFA_OFFSET -4
+	jmp ret_from_intr
+	CFI_ENDPROC
+ENDPROC(perfctr_interrupt)
+#endif
+
 ENTRY(coprocessor_error)
 	RING0_INT_FRAME
 	pushl $0
--- linux-2.6.31.perfctr26/arch/x86/kernel/entry_64.S.~1~	2009-09-10 13:41:50.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/x86/kernel/entry_64.S	2009-09-10 14:12:53.000000000 +0200
@@ -1026,6 +1026,11 @@ apicinterrupt LOCAL_PENDING_VECTOR \
 	perf_pending_interrupt smp_perf_pending_interrupt
 #endif
 
+#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_KPERFCTR)
+apicinterrupt LOCAL_PERFCTR_VECTOR \
+	perfctr_interrupt smp_perfctr_interrupt
+#endif
+
 /*
  * Exception entry points.
  */
--- linux-2.6.31.perfctr26/arch/x86/kernel/irqinit.c.~1~	2009-09-10 13:41:50.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/x86/kernel/irqinit.c	2009-09-10 14:12:53.000000000 +0200
@@ -25,6 +25,7 @@
 #include <asm/apic.h>
 #include <asm/setup.h>
 #include <asm/i8259.h>
+#include <asm/perfctr.h>
 #include <asm/traps.h>
 
 /*
@@ -253,6 +254,8 @@ void __init native_init_IRQ(void)
 			set_intr_gate(i, interrupt[i-FIRST_EXTERNAL_VECTOR]);
 	}
 
+	perfctr_vector_init();
+
 	if (!acpi_ioapic)
 		setup_irq(2, &irq2);
 
--- linux-2.6.31.perfctr26/arch/x86/kernel/process.c.~1~	2009-09-10 13:41:50.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/x86/kernel/process.c	2009-09-10 14:12:53.000000000 +0200
@@ -8,6 +8,7 @@
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/clockchips.h>
+#include <linux/perfctr.h>
 #include <linux/random.h>
 #include <trace/power.h>
 #include <asm/system.h>
@@ -88,6 +89,7 @@ void exit_thread(void)
 		put_cpu();
 		kfree(bp);
 	}
+	perfctr_exit_thread(t);
 }
 
 void flush_thread(void)
--- linux-2.6.31.perfctr26/arch/x86/kernel/process_32.c.~1~	2009-09-10 13:41:50.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/x86/kernel/process_32.c	2009-09-10 14:12:53.000000000 +0200
@@ -27,6 +27,7 @@
 #include <linux/delay.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
+#include <linux/perfctr.h>
 #include <linux/mc146818rtc.h>
 #include <linux/module.h>
 #include <linux/kallsyms.h>
@@ -262,6 +263,8 @@ int copy_thread(unsigned long clone_flag
 
 	task_user_gs(p) = get_user_gs(regs);
 
+	perfctr_copy_task(p, regs);
+
 	tsk = current;
 	if (unlikely(test_tsk_thread_flag(tsk, TIF_IO_BITMAP))) {
 		p->thread.io_bitmap_ptr = kmemdup(tsk->thread.io_bitmap_ptr,
@@ -425,6 +428,8 @@ __switch_to(struct task_struct *prev_p, 
 
 	percpu_write(current_task, next_p);
 
+	perfctr_resume_thread(next);
+
 	return prev_p;
 }
 
--- linux-2.6.31.perfctr26/arch/x86/kernel/process_64.c.~1~	2009-09-10 13:41:50.000000000 +0200
+++ linux-2.6.31.perfctr26/arch/x86/kernel/process_64.c	2009-09-10 14:12:53.000000000 +0200
@@ -30,6 +30,7 @@
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/ptrace.h>
+#include <linux/perfctr.h>
 #include <linux/notifier.h>
 #include <linux/kprobes.h>
 #include <linux/kdebug.h>
@@ -306,6 +307,8 @@ int copy_thread(unsigned long clone_flag
 	savesegment(es, p->thread.es);
 	savesegment(ds, p->thread.ds);
 
+	perfctr_copy_task(p, regs);
+
 	if (unlikely(test_tsk_thread_flag(me, TIF_IO_BITMAP))) {
 		p->thread.io_bitmap_ptr = kmalloc(IO_BITMAP_BYTES, GFP_KERNEL);
 		if (!p->thread.io_bitmap_ptr) {
@@ -489,6 +492,9 @@ __switch_to(struct task_struct *prev_p, 
 	 */
 	if (tsk_used_math(next_p) && next_p->fpu_counter > 5)
 		math_state_restore();
+
+	perfctr_resume_thread(next);
+
 	return prev_p;
 }
 
--- linux-2.6.31.perfctr26/drivers/Makefile.~1~	2009-09-10 13:41:50.000000000 +0200
+++ linux-2.6.31.perfctr26/drivers/Makefile	2009-09-10 14:12:53.000000000 +0200
@@ -95,6 +95,7 @@ obj-$(CONFIG_MEMSTICK)		+= memstick/
 obj-$(CONFIG_NEW_LEDS)		+= leds/
 obj-$(CONFIG_INFINIBAND)	+= infiniband/
 obj-$(CONFIG_SGI_SN)		+= sn/
+obj-$(CONFIG_KPERFCTR)		+= perfctr/
 obj-y				+= firmware/
 obj-$(CONFIG_CRYPTO)		+= crypto/
 obj-$(CONFIG_SUPERH)		+= sh/
--- linux-2.6.31.perfctr26/fs/exec.c.~1~	2009-09-10 13:41:55.000000000 +0200
+++ linux-2.6.31.perfctr26/fs/exec.c	2009-09-10 14:12:53.000000000 +0200
@@ -51,6 +51,7 @@
 #include <linux/tsacct_kern.h>
 #include <linux/cn_proc.h>
 #include <linux/audit.h>
+#include <linux/perfctr.h>
 #include <linux/tracehook.h>
 #include <linux/kmod.h>
 #include <linux/fsnotify.h>
@@ -973,6 +974,7 @@ int flush_old_exec(struct linux_binprm *
 	set_task_comm(current, tcomm);
 
 	current->flags &= ~PF_RANDOMIZE;
+	perfctr_flush_thread(&current->thread);
 	flush_thread();
 
 	/* Set the new mm task size. We have to do that late because it may
--- linux-2.6.31.perfctr26/kernel/exit.c.~1~	2009-09-10 13:41:55.000000000 +0200
+++ linux-2.6.31.perfctr26/kernel/exit.c	2009-09-10 14:12:53.000000000 +0200
@@ -29,6 +29,7 @@
 #include <linux/proc_fs.h>
 #include <linux/kthread.h>
 #include <linux/mempolicy.h>
+#include <linux/perfctr.h>
 #include <linux/taskstats_kern.h>
 #include <linux/delayacct.h>
 #include <linux/freezer.h>
@@ -206,6 +207,7 @@ repeat:
 			leader->exit_state = EXIT_DEAD;
 	}
 
+	perfctr_release_task(p);
 	write_unlock_irq(&tasklist_lock);
 	release_thread(p);
 	call_rcu(&p->rcu, delayed_put_task_struct);
--- linux-2.6.31.perfctr26/kernel/pid.c.~1~	2009-09-10 13:41:55.000000000 +0200
+++ linux-2.6.31.perfctr26/kernel/pid.c	2009-09-10 14:12:53.000000000 +0200
@@ -387,6 +387,7 @@ struct task_struct *find_task_by_vpid(pi
 {
 	return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
 }
+EXPORT_SYMBOL(find_task_by_vpid);
 
 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
 {
--- linux-2.6.31.perfctr26/kernel/sched.c.~1~	2009-09-10 13:41:55.000000000 +0200
+++ linux-2.6.31.perfctr26/kernel/sched.c	2009-09-10 14:12:53.000000000 +0200
@@ -55,6 +55,7 @@
 #include <linux/cpu.h>
 #include <linux/cpuset.h>
 #include <linux/percpu.h>
+#include <linux/perfctr.h>
 #include <linux/kthread.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
@@ -6967,6 +6968,8 @@ int set_cpus_allowed_ptr(struct task_str
 	struct rq *rq;
 	int ret = 0;
 
+	perfctr_set_cpus_allowed(p, *new_mask); /* XXX: convert to _ptr */
+
 	rq = task_rq_lock(p, &flags);
 	if (!cpumask_intersects(new_mask, cpu_online_mask)) {
 		ret = -EINVAL;
--- linux-2.6.31.perfctr26/kernel/timer.c.~1~	2009-09-10 13:41:55.000000000 +0200
+++ linux-2.6.31.perfctr26/kernel/timer.c	2009-09-10 14:12:53.000000000 +0200
@@ -33,6 +33,7 @@
 #include <linux/jiffies.h>
 #include <linux/posix-timers.h>
 #include <linux/cpu.h>
+#include <linux/perfctr.h>
 #include <linux/syscalls.h>
 #include <linux/delay.h>
 #include <linux/tick.h>
@@ -1155,6 +1156,7 @@ void update_process_times(int user_tick)
 
 	/* Note: this timer irq context must be accounted for as well. */
 	account_process_tick(p, user_tick);
+	perfctr_sample_thread(&p->thread);
 	run_local_timers();
 	if (rcu_pending(cpu))
 		rcu_check_callbacks(cpu, user_tick);
