diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-17 19:10:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-17 19:10:28 +0200 |
| commit | 4f6e1fe1d8ba3d9f4fb52dd006da9714d75243cf (patch) | |
| tree | e528e185d3f166c9bc7d628dce87c366e5fe5151 /include | |
| parent | Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux (diff) | |
| parent | Merge branches 'oprofile/fixes', 'oprofile/next' and 'oprofile/master' into o... (diff) | |
| download | linux-4f6e1fe1d8ba3d9f4fb52dd006da9714d75243cf.tar.xz linux-4f6e1fe1d8ba3d9f4fb52dd006da9714d75243cf.zip | |
Merge branch 'auto' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into oprofile
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/oprofile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h index 1d9518bc4c58..d68d2ed94f15 100644 --- 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 */ |