Signed-off-by: Robert Richter <[EMAIL PROTECTED]>
---
arch/ia64/perfmon/perfmon_compat.c | 2 +-
arch/ia64/perfmon/perfmon_default_smpl.c | 2 +-
arch/powerpc/perfmon/perfmon_cell.c | 2 +-
arch/x86/perfmon/perfmon.c | 2 +-
arch/x86/perfmon/perfmon_intel_arch.c | 2 +-
arch/x86/perfmon/perfmon_intel_core.c | 2 +-
arch/x86/perfmon/perfmon_p4.c | 2 +-
arch/x86/perfmon/perfmon_p6.c | 2 +-
perfmon/perfmon_smpl.c | 2 +-
perfmon/perfmon_syscalls.c | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/ia64/perfmon/perfmon_compat.c
b/arch/ia64/perfmon/perfmon_compat.c
index 43140f4..0ae7860 100644
--- a/arch/ia64/perfmon/perfmon_compat.c
+++ b/arch/ia64/perfmon/perfmon_compat.c
@@ -27,7 +27,7 @@
#include <linux/vmalloc.h>
#include <linux/proc_fs.h>
#include <linux/perfmon_kern.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
asmlinkage long sys_pfm_stop(int fd);
asmlinkage long sys_pfm_start(int fd, struct pfarg_start __user *st);
diff --git a/arch/ia64/perfmon/perfmon_default_smpl.c
b/arch/ia64/perfmon/perfmon_default_smpl.c
index 702bdf9..cd5351b 100644
--- a/arch/ia64/perfmon/perfmon_default_smpl.c
+++ b/arch/ia64/perfmon/perfmon_default_smpl.c
@@ -24,7 +24,7 @@
#include <linux/types.h>
#include <linux/module.h>
#include <linux/init.h>
-#include <asm/delay.h>
+#include <linux/delay.h>
#include <linux/smp.h>
#include <linux/sysctl.h>
diff --git a/arch/powerpc/perfmon/perfmon_cell.c
b/arch/powerpc/perfmon/perfmon_cell.c
index e573071..0c4201f 100644
--- a/arch/powerpc/perfmon/perfmon_cell.c
+++ b/arch/powerpc/perfmon/perfmon_cell.c
@@ -26,9 +26,9 @@
#include <linux/module.h>
#include <linux/perfmon_kern.h>
+#include <linux/io.h>
#include <asm/cell-pmu.h>
#include <asm/cell-regs.h>
-#include <asm/io.h>
#include <asm/machdep.h>
#include <asm/rtas.h>
#include <asm/ps3.h>
diff --git a/arch/x86/perfmon/perfmon.c b/arch/x86/perfmon/perfmon.c
index 3a639c8..60d3c09 100644
--- a/arch/x86/perfmon/perfmon.c
+++ b/arch/x86/perfmon/perfmon.c
@@ -25,8 +25,8 @@
#include <linux/perfmon_kern.h>
#include <linux/kprobes.h>
#include <linux/kdebug.h>
+#include <linux/nmi.h>
-#include <asm/nmi.h>
#include <asm/apic.h>
DEFINE_PER_CPU(unsigned long, real_iip);
diff --git a/arch/x86/perfmon/perfmon_intel_arch.c
b/arch/x86/perfmon/perfmon_intel_arch.c
index 36762d5..3576094 100644
--- a/arch/x86/perfmon/perfmon_intel_arch.c
+++ b/arch/x86/perfmon/perfmon_intel_arch.c
@@ -25,9 +25,9 @@
#include <linux/module.h>
#include <linux/kprobes.h>
#include <linux/perfmon_kern.h>
+#include <linux/nmi.h>
#include <asm/msr.h>
#include <asm/apic.h>
-#include <asm/nmi.h>
MODULE_AUTHOR("Stephane Eranian <[EMAIL PROTECTED]>");
MODULE_DESCRIPTION("Intel architectural perfmon v1");
diff --git a/arch/x86/perfmon/perfmon_intel_core.c
b/arch/x86/perfmon/perfmon_intel_core.c
index 82187dd..10a0cd2 100644
--- a/arch/x86/perfmon/perfmon_intel_core.c
+++ b/arch/x86/perfmon/perfmon_intel_core.c
@@ -8,7 +8,7 @@
#include <linux/module.h>
#include <linux/kprobes.h>
#include <linux/perfmon_kern.h>
-#include <asm/nmi.h>
+#include <linux/nmi.h>
MODULE_AUTHOR("Stephane Eranian <[EMAIL PROTECTED]>");
MODULE_DESCRIPTION("Intel Core");
diff --git a/arch/x86/perfmon/perfmon_p4.c b/arch/x86/perfmon/perfmon_p4.c
index 757fccd..767283a 100644
--- a/arch/x86/perfmon/perfmon_p4.c
+++ b/arch/x86/perfmon/perfmon_p4.c
@@ -22,9 +22,9 @@
#include <linux/module.h>
#include <linux/perfmon_kern.h>
#include <linux/kprobes.h>
+#include <linux/nmi.h>
#include <asm/msr.h>
#include <asm/apic.h>
-#include <asm/nmi.h>
MODULE_AUTHOR("Bryan Wilkerson <[EMAIL PROTECTED]>");
MODULE_DESCRIPTION("P4/Xeon/EM64T PMU description table");
diff --git a/arch/x86/perfmon/perfmon_p6.c b/arch/x86/perfmon/perfmon_p6.c
index dd1a39f..dbc593d 100644
--- a/arch/x86/perfmon/perfmon_p6.c
+++ b/arch/x86/perfmon/perfmon_p6.c
@@ -24,8 +24,8 @@
#include <linux/module.h>
#include <linux/kprobes.h>
#include <linux/perfmon_kern.h>
+#include <linux/nmi.h>
#include <asm/msr.h>
-#include <asm/nmi.h>
MODULE_AUTHOR("Stephane Eranian <[EMAIL PROTECTED]>");
MODULE_DESCRIPTION("P6 PMU description table");
diff --git a/perfmon/perfmon_smpl.c b/perfmon/perfmon_smpl.c
index f650b63..a19eed1 100644
--- a/perfmon/perfmon_smpl.c
+++ b/perfmon/perfmon_smpl.c
@@ -42,7 +42,7 @@
#include <linux/fs.h>
#include <linux/perfmon_kern.h>
#include <linux/random.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "perfmon_priv.h"
/**
diff --git a/perfmon/perfmon_syscalls.c b/perfmon/perfmon_syscalls.c
index 4196e74..1aca2d7 100644
--- a/perfmon/perfmon_syscalls.c
+++ b/perfmon/perfmon_syscalls.c
@@ -39,7 +39,7 @@
#include <linux/fs.h>
#include <linux/ptrace.h>
#include <linux/perfmon_kern.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
#include "perfmon_priv.h"
/*
--
1.5.3.7
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
perfmon2-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/perfmon2-devel
