linux-mips
[Top] [All Lists]

[PATCH] Fix oprofile compilation error.

To: linux-mips@linux-mips.org
Subject: [PATCH] Fix oprofile compilation error.
From: David Daney <ddaney@avtrex.com>
Date: Tue, 04 Oct 2005 22:06:10 -0700
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mozilla Thunderbird 1.0.7-1.1.fc3 (X11/20050929)
Looks like oprofile_arch_init() was changed so that we have to fill in the caller's oprofile_operations instead of setting a pointer to ours.

We can now make the prototype oprofile_operations be __initdata as a copy is being made.


Signed-off-by: David Daney <ddaney@avtrex.com>


diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
--- a/arch/mips/oprofile/common.c
+++ b/arch/mips/oprofile/common.c
@@ -68,7 +68,7 @@ static void op_mips_stop(void)
        on_each_cpu(model->cpu_stop, NULL, 0, 1);
 }

-static struct oprofile_operations oprof_mips_ops = {
+static struct oprofile_operations oprof_mips_ops __initdata = {
        .create_files   = op_mips_create_files,
        .setup          = op_mips_setup,
        .start          = op_mips_start,
@@ -76,7 +76,7 @@ static struct oprofile_operations oprof_
        .cpu_type       = NULL
 };

-int __init oprofile_arch_init(struct oprofile_operations **ops)
+int __init oprofile_arch_init(struct oprofile_operations *ops)
 {
        struct op_mips_model *lmodel = NULL;
        int res;
@@ -101,7 +101,7 @@ int __init oprofile_arch_init(struct opr
        model = lmodel;

        oprof_mips_ops.cpu_type = lmodel->cpu_type;
-       *ops = &oprof_mips_ops;
+       *ops = oprof_mips_ops;

        printk(KERN_INFO "oprofile: using %s performance monitoring.\n",
               lmodel->cpu_type);

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] Fix oprofile compilation error., David Daney <=