Commit bad4bd7f authored by Andi Kleen's avatar Andi Kleen Committed by Stephen Hemminger

[PATCH] Allow P4 oprofile code for x86-64

P4 support was previously ifdefed out for x86-64, remove that.
parent bd31fffe
...@@ -295,8 +295,6 @@ struct oprofile_operations nmi_ops = { ...@@ -295,8 +295,6 @@ struct oprofile_operations nmi_ops = {
}; };
#if !defined(CONFIG_X86_64)
static int __init p4_init(void) static int __init p4_init(void)
{ {
__u8 cpu_model = current_cpu_data.x86_model; __u8 cpu_model = current_cpu_data.x86_model;
...@@ -347,9 +345,6 @@ static int __init ppro_init(void) ...@@ -347,9 +345,6 @@ static int __init ppro_init(void)
return 1; return 1;
} }
#endif /* !CONFIG_X86_64 */
/* in order to get driverfs right */ /* in order to get driverfs right */
static int using_nmi; static int using_nmi;
...@@ -381,7 +376,6 @@ int __init nmi_init(struct oprofile_operations ** ops) ...@@ -381,7 +376,6 @@ int __init nmi_init(struct oprofile_operations ** ops)
} }
break; break;
#if !defined(CONFIG_X86_64)
case X86_VENDOR_INTEL: case X86_VENDOR_INTEL:
switch (family) { switch (family) {
/* Pentium IV */ /* Pentium IV */
...@@ -400,7 +394,6 @@ int __init nmi_init(struct oprofile_operations ** ops) ...@@ -400,7 +394,6 @@ int __init nmi_init(struct oprofile_operations ** ops)
return -ENODEV; return -ENODEV;
} }
break; break;
#endif /* !CONFIG_X86_64 */
default: default:
return -ENODEV; return -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment