Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core

[pandora-kernel.git] / include / linux / oprofile.h

diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
index 1d9518b..d68d2ed 100644 (file)
--- a/include/linux/oprofile.h
+++ b/include/linux/oprofile.h
@@ -171,7 +171,6 @@ struct op_sample;
 struct op_entry {
        struct ring_buffer_event *event;
        struct op_sample *sample;
-       unsigned long irq_flags;
        unsigned long size;
        unsigned long *data;
 };
@@ -180,6 +179,7 @@ void oprofile_write_reserve(struct op_entry *entry,
                            struct pt_regs * const regs,
                            unsigned long pc, int code, int size);
 int oprofile_add_data(struct op_entry *entry, unsigned long val);
+int oprofile_add_data64(struct op_entry *entry, u64 val);
 int oprofile_write_commit(struct op_entry *entry);
 
 #endif /* OPROFILE_H */