vserver 1.9.5.x5

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

diff --git a/arch/alpha/oprofile/common.c b/arch/alpha/oprofile/common.c
index 4ab14ed..908eb4a 100644 (file)
--- a/arch/alpha/oprofile/common.c
+++ b/arch/alpha/oprofile/common.c
@@ -138,17 +138,8 @@ op_axp_create_files(struct super_block * sb, struct dentry * root)
        return 0;
 }
 
-static struct oprofile_operations oprof_axp_ops = {
-       .create_files   = op_axp_create_files,
-       .setup          = op_axp_setup,
-       .shutdown       = op_axp_shutdown,
-       .start          = op_axp_start,
-       .stop           = op_axp_stop,
-       .cpu_type       = NULL          /* To be filled in below.  */
-};
-
 int __init
-oprofile_arch_init(struct oprofile_operations **ops)
+oprofile_arch_init(struct oprofile_operations *ops)
 {
        struct op_axp_model *lmodel = NULL;
 
@@ -178,8 +169,12 @@ oprofile_arch_init(struct oprofile_operations **ops)
                return -ENODEV;
        model = lmodel;
 
-       oprof_axp_ops.cpu_type = lmodel->cpu_type;
-       *ops = &oprof_axp_ops;
+       ops->create_files = op_axp_create_files;
+       ops->setup = op_axp_setup;
+       ops->shutdown = op_axp_shutdown;
+       ops->start = op_axp_start;
+       ops->stop = op_axp_stop;
+       ops->cpu_type = lmodel->cpu_type;
 
        printk(KERN_INFO "oprofile: using %s performance monitoring.\n",
               lmodel->cpu_type);