Merge linux-2.6 with linux-acpi-2.6

[linux-2.6] / include / asm-ppc64 / cputable.h

diff --git a/include/asm-ppc64/cputable.h b/include/asm-ppc64/cputable.h
index 445727ae2baa91e92383044fbcaf25fd45fd231b..acc9b4d6c16846a46d7f0f8120d36819c911e60e 100644 (file)
--- a/include/asm-ppc64/cputable.h
+++ b/include/asm-ppc64/cputable.h
@@ -36,6 +36,7 @@
  * via the mkdefs mechanism.
  */
 struct cpu_spec;
+struct op_ppc64_model;
 
 typedef        void (*cpu_setup_t)(unsigned long offset, struct cpu_spec* spec);
 
@@ -62,6 +63,9 @@ struct cpu_spec {
 
        /* Used by oprofile userspace to select the right counters */
        char            *oprofile_cpu_type;
+
+       /* Processor specific oprofile operations */
+       struct op_ppc64_model *oprofile_model;
 };
 
 extern struct cpu_spec         cpu_specs[];