Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/macintosh/adbhid.c

1 files changed, 6 insertions, 4 deletions

diff --git a/include/asm-powerpc/oprofile_impl.h b/include/asm-powerpc/oprofile_impl.h
index 8d6b47f7b300..938fefb4c4bc 100644
--- a/include/asm-powerpc/oprofile_impl.h
+++ b/include/asm-powerpc/oprofile_impl.h
@@ -39,14 +39,16 @@ struct op_system_config {
 
 /* Per-arch configuration */
 struct op_powerpc_model {
-        void (*reg_setup) (struct op_counter_config *,
+        int (*reg_setup) (struct op_counter_config *,
                            struct op_system_config *,
                            int num_counters);
-        void (*cpu_setup) (struct op_counter_config *);
-        void (*start) (struct op_counter_config *);
-        void (*global_start) (struct op_counter_config *);
+        int  (*cpu_setup) (struct op_counter_config *);
+        int  (*start) (struct op_counter_config *);
+        int  (*global_start) (struct op_counter_config *);
         void (*stop) (void);
         void (*global_stop) (void);
+        int (*sync_start)(void);
+        int (*sync_stop)(void);
         void (*handle_interrupt) (struct pt_regs *,
                                   struct op_counter_config *);
         int num_counters;