--- linux-2.6.18.perfctr26/CREDITS.~1~	2008-06-22 17:35:05.000000000 +0200
+++ linux-2.6.18.perfctr26/CREDITS	2008-06-22 17:37:20.000000000 +0200
@@ -2629,9 +2629,10 @@ S: Ottawa, Ontario
 S: Canada K2P 0X8
 
 N: Mikael Pettersson
-E: mikpe@csd.uu.se
-W: http://www.csd.uu.se/~mikpe/
+E: mikpe@it.uu.se
+W: http://user.it.uu.se/~mikpe/
 D: Miscellaneous fixes
+D: Performance-monitoring counters driver
 
 N: Reed H. Petty
 E: rhp@draper.net
--- linux-2.6.18.perfctr26/Documentation/ioctl-number.txt.~1~	2008-06-22 17:20:35.000000000 +0200
+++ linux-2.6.18.perfctr26/Documentation/ioctl-number.txt	2008-06-22 17:37:14.000000000 +0200
@@ -187,6 +187,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@csd.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.18.perfctr26/MAINTAINERS.~1~	2008-06-22 17:35:05.000000000 +0200
+++ linux-2.6.18.perfctr26/MAINTAINERS	2008-06-22 17:37:20.000000000 +0200
@@ -2272,6 +2272,12 @@ M:	nagar@watson.ibm.com
 L:	linux-kernel@vger.kernel.org
 S:	Maintained
 
+PERFORMANCE-MONITORING COUNTERS DRIVER
+P:	Mikael Pettersson
+M:	mikpe@it.uu.se
+W:	http://user.it.uu.se/~mikpe/linux/perfctr/
+S:	Maintained
+
 PERSONALITY HANDLING
 P:	Christoph Hellwig
 M:	hch@infradead.org
--- linux-2.6.18.perfctr26/arch/i386/Kconfig.~1~	2008-06-22 17:35:05.000000000 +0200
+++ linux-2.6.18.perfctr26/arch/i386/Kconfig	2008-06-22 17:37:14.000000000 +0200
@@ -737,6 +737,8 @@ config SECCOMP
 
 	  If unsure, say Y. Only embedded should say N here.
 
+source "drivers/perfctr/Kconfig"
+
 source kernel/Kconfig.hz
 
 config KEXEC
--- linux-2.6.18.perfctr26/arch/i386/kernel/entry.S.~1~	2008-06-22 17:35:05.000000000 +0200
+++ linux-2.6.18.perfctr26/arch/i386/kernel/entry.S	2008-06-22 17:37:14.000000000 +0200
@@ -591,6 +591,22 @@ ENTRY(name)				\
 /* The include is where all of the SMP etc. interrupts come from */
 #include "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
+#endif
+
 ENTRY(divide_error)
 	RING0_INT_FRAME
 	pushl $0			# no error code
--- linux-2.6.18.perfctr26/arch/i386/kernel/i8259.c.~1~	2008-06-22 17:35:05.000000000 +0200
+++ linux-2.6.18.perfctr26/arch/i386/kernel/i8259.c	2008-06-22 17:37:14.000000000 +0200
@@ -22,6 +22,7 @@
 #include <asm/apic.h>
 #include <asm/arch_hooks.h>
 #include <asm/i8259.h>
+#include <asm/perfctr.h>
 
 #include <io_ports.h>
 
@@ -420,6 +421,8 @@ void __init init_IRQ(void)
 	 */
 	intr_init_hook();
 
+	perfctr_vector_init();
+
 	/*
 	 * Set the clock to HZ Hz, we already have a valid
 	 * vector now:
--- linux-2.6.18.perfctr26/arch/i386/kernel/process.c.~1~	2008-06-22 17:35:05.000000000 +0200
+++ linux-2.6.18.perfctr26/arch/i386/kernel/process.c	2008-06-22 17:37:14.000000000 +0200
@@ -32,6 +32,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>
@@ -379,6 +380,7 @@ void exit_thread(void)
 		tss->io_bitmap_base = INVALID_IO_BITMAP_OFFSET;
 		put_cpu();
 	}
+	perfctr_exit_thread(&current->thread);
 }
 
 void flush_thread(void)
@@ -431,6 +433,8 @@ int copy_thread(int nr, unsigned long cl
 	savesegment(fs,p->thread.fs);
 	savesegment(gs,p->thread.gs);
 
+	perfctr_copy_task(p, regs);
+
 	tsk = current;
 	if (unlikely(test_tsk_thread_flag(tsk, TIF_IO_BITMAP))) {
 		p->thread.io_bitmap_ptr = kmalloc(IO_BITMAP_BYTES, GFP_KERNEL);
@@ -696,6 +700,8 @@ struct task_struct fastcall * __switch_t
 
 	disable_tsc(prev_p, next_p);
 
+	perfctr_resume_thread(next);
+
 	return prev_p;
 }
 
--- linux-2.6.18.perfctr26/arch/powerpc/Kconfig.~1~	2008-06-22 17:35:06.000000000 +0200
+++ linux-2.6.18.perfctr26/arch/powerpc/Kconfig	2008-06-22 17:37:14.000000000 +0200
@@ -320,6 +320,11 @@ config NOT_COHERENT_CACHE
 	bool
 	depends on 4xx || 8xx || E200
 	default y
+
+if PPC32
+source "drivers/perfctr/Kconfig"
+endif
+
 endmenu
 
 source "init/Kconfig"
--- linux-2.6.18.perfctr26/arch/powerpc/kernel/process.c.~1~	2008-06-22 17:35:06.000000000 +0200
+++ linux-2.6.18.perfctr26/arch/powerpc/kernel/process.c	2008-06-22 17:37:14.000000000 +0200
@@ -31,6 +31,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>
@@ -332,7 +333,9 @@ struct task_struct *__switch_to(struct t
 	account_process_vtime(current);
 	calculate_steal_time();
 
+	perfctr_suspend_thread(&prev->thread);
 	last = _switch(old_thread, new_thread);
+	perfctr_resume_thread(&current->thread);
 
 	local_irq_restore(flags);
 
@@ -464,6 +467,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)
@@ -576,6 +580,8 @@ int copy_thread(int nr, unsigned long cl
 	p->thread.last_syscall = -1;
 #endif
 
+	perfctr_copy_task(p, regs);
+
 	return 0;
 }
 
--- linux-2.6.18.perfctr26/arch/x86_64/Kconfig.~1~	2008-06-22 17:35:06.000000000 +0200
+++ linux-2.6.18.perfctr26/arch/x86_64/Kconfig	2008-06-22 17:37:14.000000000 +0200
@@ -526,6 +526,8 @@ config SECCOMP
 
 	  If unsure, say Y. Only embedded should say N here.
 
+source "drivers/perfctr/Kconfig"
+
 source kernel/Kconfig.hz
 
 config REORDER
--- linux-2.6.18.perfctr26/arch/x86_64/kernel/entry.S.~1~	2008-06-22 17:35:06.000000000 +0200
+++ linux-2.6.18.perfctr26/arch/x86_64/kernel/entry.S	2008-06-22 17:37:14.000000000 +0200
@@ -693,6 +693,12 @@ ENTRY(spurious_interrupt)
 END(spurious_interrupt)
 #endif
 				
+#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_KPERFCTR)
+ENTRY(perfctr_interrupt)
+	apicinterrupt LOCAL_PERFCTR_VECTOR,smp_perfctr_interrupt
+END(perfctr_interrupt)
+#endif
+
 /*
  * Exception entry points.
  */ 		
--- linux-2.6.18.perfctr26/arch/x86_64/kernel/i8259.c.~1~	2008-06-22 17:35:06.000000000 +0200
+++ linux-2.6.18.perfctr26/arch/x86_64/kernel/i8259.c	2008-06-22 17:37:14.000000000 +0200
@@ -22,6 +22,7 @@
 #include <asm/delay.h>
 #include <asm/desc.h>
 #include <asm/apic.h>
+#include <asm/perfctr.h>
 
 /*
  * Common place to define all x86 IRQ vectors
@@ -590,6 +591,8 @@ void __init init_IRQ(void)
 	set_intr_gate(ERROR_APIC_VECTOR, error_interrupt);
 #endif
 
+	perfctr_vector_init();
+
 	/*
 	 * Set the clock to HZ Hz, we already have a valid
 	 * vector now:
--- linux-2.6.18.perfctr26/arch/x86_64/kernel/process.c.~1~	2008-06-22 17:35:06.000000000 +0200
+++ linux-2.6.18.perfctr26/arch/x86_64/kernel/process.c	2008-06-22 17:37:14.000000000 +0200
@@ -32,6 +32,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/ptrace.h>
+#include <linux/perfctr.h>
 #include <linux/utsname.h>
 #include <linux/random.h>
 #include <linux/notifier.h>
@@ -357,6 +358,7 @@ void exit_thread(void)
 		t->io_bitmap_max = 0;
 		put_cpu();
 	}
+	perfctr_exit_thread(&me->thread);
 }
 
 void flush_thread(void)
@@ -461,6 +463,8 @@ int copy_thread(int nr, unsigned long cl
 	asm("mov %%es,%0" : "=m" (p->thread.es));
 	asm("mov %%ds,%0" : "=m" (p->thread.ds));
 
+	perfctr_copy_task(p, regs);
+
 	if (unlikely(me->thread.io_bitmap_ptr != NULL)) { 
 		p->thread.io_bitmap_ptr = kmalloc(IO_BITMAP_BYTES, GFP_KERNEL);
 		if (!p->thread.io_bitmap_ptr) {
@@ -618,6 +622,8 @@ __switch_to(struct task_struct *prev_p, 
 		}
 	}
 
+	perfctr_resume_thread(next);
+
 	return prev_p;
 }
 
--- linux-2.6.18.perfctr26/drivers/Makefile.~1~	2008-06-22 17:35:06.000000000 +0200
+++ linux-2.6.18.perfctr26/drivers/Makefile	2008-06-22 17:37:14.000000000 +0200
@@ -71,6 +71,7 @@ obj-$(CONFIG_NEW_LEDS)		+= leds/
 obj-$(CONFIG_INFINIBAND)	+= infiniband/
 obj-$(CONFIG_IPATH_CORE)	+= infiniband/
 obj-$(CONFIG_SGI_SN)		+= sn/
+obj-$(CONFIG_KPERFCTR)		+= perfctr/
 obj-y				+= firmware/
 obj-$(CONFIG_CRYPTO)		+= crypto/
 obj-$(CONFIG_SUPERH)		+= sh/
--- linux-2.6.18.perfctr26/fs/exec.c.~1~	2008-06-22 17:35:07.000000000 +0200
+++ linux-2.6.18.perfctr26/fs/exec.c	2008-06-22 17:37:20.000000000 +0200
@@ -49,6 +49,7 @@
 #include <linux/acct.h>
 #include <linux/cn_proc.h>
 #include <linux/audit.h>
+#include <linux/perfctr.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
@@ -875,6 +876,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.18.perfctr26/include/asm-i386/mach-default/irq_vectors.h.~1~	2008-06-22 15:56:54.000000000 +0200
+++ linux-2.6.18.perfctr26/include/asm-i386/mach-default/irq_vectors.h	2008-06-22 17:37:14.000000000 +0200
@@ -56,14 +56,15 @@
  * sources per level' errata.
  */
 #define LOCAL_TIMER_VECTOR	0xef
+#define LOCAL_PERFCTR_VECTOR	0xee
 
 /*
- * First APIC vector available to drivers: (vectors 0x30-0xee)
+ * First APIC vector available to drivers: (vectors 0x30-0xed)
  * we start at 0x31 to spread out vectors evenly between priority
  * levels. (0x80 is the syscall vector)
  */
 #define FIRST_DEVICE_VECTOR	0x31
-#define FIRST_SYSTEM_VECTOR	0xef
+#define FIRST_SYSTEM_VECTOR	0xee
 
 #define TIMER_IRQ 0
 
--- linux-2.6.18.perfctr26/include/asm-i386/mach-visws/irq_vectors.h.~1~	2008-06-22 15:56:54.000000000 +0200
+++ linux-2.6.18.perfctr26/include/asm-i386/mach-visws/irq_vectors.h	2008-06-22 17:37:14.000000000 +0200
@@ -35,14 +35,15 @@
  * sources per level' errata.
  */
 #define LOCAL_TIMER_VECTOR	0xef
+#define LOCAL_PERFCTR_VECTOR	0xee
 
 /*
- * First APIC vector available to drivers: (vectors 0x30-0xee)
+ * First APIC vector available to drivers: (vectors 0x30-0xed)
  * we start at 0x31 to spread out vectors evenly between priority
  * levels. (0x80 is the syscall vector)
  */
 #define FIRST_DEVICE_VECTOR	0x31
-#define FIRST_SYSTEM_VECTOR	0xef
+#define FIRST_SYSTEM_VECTOR	0xee
 
 #define TIMER_IRQ 0
 
--- linux-2.6.18.perfctr26/include/asm-i386/processor.h.~1~	2008-06-22 17:35:07.000000000 +0200
+++ linux-2.6.18.perfctr26/include/asm-i386/processor.h	2008-06-22 17:37:14.000000000 +0200
@@ -471,6 +471,8 @@ struct thread_struct {
  	unsigned long	iopl;
 /* max allowed port in the bitmap, in bytes: */
 	unsigned long	io_bitmap_max;
+/* performance counters */
+	struct vperfctr *perfctr;
 };
 
 #define INIT_THREAD  {							\
--- linux-2.6.18.perfctr26/include/asm-i386/system.h.~1~	2008-06-22 17:35:07.000000000 +0200
+++ linux-2.6.18.perfctr26/include/asm-i386/system.h	2008-06-22 17:37:14.000000000 +0200
@@ -17,6 +17,7 @@ extern struct task_struct * FASTCALL(__s
  */
 #define switch_to(prev,next,last) do {					\
 	unsigned long esi,edi;						\
+	perfctr_suspend_thread(&(prev)->thread);			\
 	asm volatile("pushfl\n\t"		/* Save flags */	\
 		     "pushl %%ebp\n\t"					\
 		     "movl %%esp,%0\n\t"	/* save ESP */		\
--- linux-2.6.18.perfctr26/include/asm-powerpc/processor.h.~1~	2008-06-22 17:35:07.000000000 +0200
+++ linux-2.6.18.perfctr26/include/asm-powerpc/processor.h	2008-06-22 17:37:14.000000000 +0200
@@ -169,6 +169,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.18.perfctr26/include/asm-x86_64/hw_irq.h.~1~	2008-06-22 17:35:10.000000000 +0200
+++ linux-2.6.18.perfctr26/include/asm-x86_64/hw_irq.h	2008-06-22 17:37:14.000000000 +0200
@@ -64,14 +64,15 @@ struct hw_interrupt_type;
  * sources per level' errata.
  */
 #define LOCAL_TIMER_VECTOR	0xef
+#define LOCAL_PERFCTR_VECTOR	0xee
 
 /*
- * First APIC vector available to drivers: (vectors 0x30-0xee)
+ * First APIC vector available to drivers: (vectors 0x30-0xed)
  * we start at 0x31 to spread out vectors evenly between priority
  * levels. (0x80 is the syscall vector)
  */
 #define FIRST_DEVICE_VECTOR	0x31
-#define FIRST_SYSTEM_VECTOR	0xef   /* duplicated in irq.h */
+#define FIRST_SYSTEM_VECTOR	0xee   /* duplicated in irq.h */
 
 
 #ifndef __ASSEMBLY__
--- linux-2.6.18.perfctr26/include/asm-x86_64/irq.h.~1~	2008-06-22 17:35:10.000000000 +0200
+++ linux-2.6.18.perfctr26/include/asm-x86_64/irq.h	2008-06-22 17:37:14.000000000 +0200
@@ -29,7 +29,7 @@
  */
 #define NR_VECTORS 256
 
-#define FIRST_SYSTEM_VECTOR	0xef   /* duplicated in hw_irq.h */
+#define FIRST_SYSTEM_VECTOR	0xee   /* duplicated in hw_irq.h */
 
 #ifdef CONFIG_PCI_MSI
 #define NR_IRQS FIRST_SYSTEM_VECTOR
--- linux-2.6.18.perfctr26/include/asm-x86_64/processor.h.~1~	2008-06-22 17:35:10.000000000 +0200
+++ linux-2.6.18.perfctr26/include/asm-x86_64/processor.h	2008-06-22 17:37:14.000000000 +0200
@@ -274,6 +274,8 @@ struct thread_struct {
 	unsigned io_bitmap_max;
 /* cached TLS descriptors. */
 	u64 tls_array[GDT_ENTRY_TLS_ENTRIES];
+/* performance counters */
+	struct vperfctr *perfctr;
 } __attribute__((aligned(16)));
 
 #define INIT_THREAD  { \
--- linux-2.6.18.perfctr26/include/asm-x86_64/system.h.~1~	2008-06-22 17:35:10.000000000 +0200
+++ linux-2.6.18.perfctr26/include/asm-x86_64/system.h	2008-06-22 17:37:14.000000000 +0200
@@ -20,7 +20,8 @@
 #define __EXTRA_CLOBBER  \
 	,"rcx","rbx","rdx","r8","r9","r10","r11","r12","r13","r14","r15"
 
-#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 */	  \
@@ -40,7 +41,8 @@
 		       [tif_fork] "i" (TIF_FORK),			  \
 		       [thread_info] "i" (offsetof(struct task_struct, thread_info)), \
 		       [pda_pcurrent] "i" (offsetof(struct x8664_pda, pcurrent))   \
-		     : "memory", "cc" __EXTRA_CLOBBER)
+		     : "memory", "cc" __EXTRA_CLOBBER); \
+} while (0)
     
 extern void load_gs_index(unsigned); 
 
--- linux-2.6.18.perfctr26/kernel/exit.c.~1~	2008-06-22 17:35:10.000000000 +0200
+++ linux-2.6.18.perfctr26/kernel/exit.c	2008-06-22 17:37:14.000000000 +0200
@@ -25,6 +25,7 @@
 #include <linux/mount.h>
 #include <linux/proc_fs.h>
 #include <linux/mempolicy.h>
+#include <linux/perfctr.h>
 #include <linux/taskstats_kern.h>
 #include <linux/delayacct.h>
 #include <linux/cpuset.h>
@@ -166,6 +167,7 @@ repeat:
 		zap_leader = (leader->exit_signal == -1);
 	}
 
+	perfctr_release_task(p);
 	sched_exit(p);
 	write_unlock_irq(&tasklist_lock);
 	proc_flush_task(p);
--- linux-2.6.18.perfctr26/kernel/sched.c.~1~	2008-06-22 17:35:10.000000000 +0200
+++ linux-2.6.18.perfctr26/kernel/sched.c	2008-06-22 17:37:14.000000000 +0200
@@ -45,6 +45,7 @@
 #include <linux/cpu.h>
 #include <linux/cpuset.h>
 #include <linux/percpu.h>
+#include <linux/perfctr.h>
 #include <linux/kthread.h>
 #include <linux/seq_file.h>
 #include <linux/syscalls.h>
@@ -4845,6 +4846,8 @@ int set_cpus_allowed(struct task_struct 
 	struct rq *rq;
 	int ret = 0;
 
+	perfctr_set_cpus_allowed(p, new_mask);
+
 	rq = task_rq_lock(p, &flags);
 	if (!cpus_intersects(new_mask, cpu_online_map)) {
 		ret = -EINVAL;
--- linux-2.6.18.perfctr26/kernel/timer.c.~1~	2008-06-22 17:35:10.000000000 +0200
+++ linux-2.6.18.perfctr26/kernel/timer.c	2008-06-22 17:37:14.000000000 +0200
@@ -32,6 +32,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>
 
@@ -1181,6 +1182,7 @@ void update_process_times(int user_tick)
 		account_user_time(p, jiffies_to_cputime(1));
 	else
 		account_system_time(p, HARDIRQ_OFFSET, jiffies_to_cputime(1));
+	perfctr_sample_thread(&p->thread);
 	run_local_timers();
 	if (rcu_pending(cpu))
 		rcu_check_callbacks(cpu, user_tick);
