Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / arch / powerpc / oprofile / common.c

diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index fd0bbbe..5b1de7e 100644 (file)
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -22,7 +22,6 @@
 #include <asm/pmc.h>
 #include <asm/cputable.h>
 #include <asm/oprofile_impl.h>
-#include <asm/firmware.h>
 
 static struct op_powerpc_model *model;
 
@@ -94,7 +93,7 @@ static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
 
        for (i = 0; i < model->num_counters; ++i) {
                struct dentry *dir;
-               char buf[4];
+               char buf[3];
 
                snprintf(buf, sizeof buf, "%d", i);
                dir = oprofilefs_mkdir(sb, root, buf);
@@ -131,9 +130,6 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
        if (!cur_cpu_spec->oprofile_cpu_type)
                return -ENODEV;
 
-       if (firmware_has_feature(FW_FEATURE_ISERIES))
-               return -ENODEV;
-
        switch (cur_cpu_spec->oprofile_type) {
 #ifdef CONFIG_PPC64
                case PPC_OPROFILE_RS64:
@@ -166,7 +162,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
        ops->stop = op_powerpc_stop;
        ops->backtrace = op_powerpc_backtrace;
 
-       printk(KERN_DEBUG "oprofile: using %s performance monitoring.\n",
+       printk(KERN_INFO "oprofile: using %s performance monitoring.\n",
               ops->cpu_type);
 
        return 0;