diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-01-02 08:17:13 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-01-02 08:17:13 -0500 |
| commit | b21a207141d83a06abc5f492b80204602e02ca44 (patch) | |
| tree | f0152cde543008c72d7eb5c12c18095ad92785e6 /include/linux/oprofile.h | |
| parent | 3af373021fa32f8f787bfbdcc1a9277a287bde4e (diff) | |
| parent | b58602a4bac012b5f4fc12fe6b46ab237b610d5d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Conflicts:
drivers/uwb/wlp/eda.c
Diffstat (limited to 'include/linux/oprofile.h')
| -rw-r--r-- | include/linux/oprofile.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h index 5231861f357d..1ce9fe572e51 100644 --- a/include/linux/oprofile.h +++ b/include/linux/oprofile.h | |||
| @@ -86,8 +86,7 @@ int oprofile_arch_init(struct oprofile_operations * ops); | |||
| 86 | void oprofile_arch_exit(void); | 86 | void oprofile_arch_exit(void); |
| 87 | 87 | ||
| 88 | /** | 88 | /** |
| 89 | * Add a sample. This may be called from any context. Pass | 89 | * Add a sample. This may be called from any context. |
| 90 | * smp_processor_id() as cpu. | ||
| 91 | */ | 90 | */ |
| 92 | void oprofile_add_sample(struct pt_regs * const regs, unsigned long event); | 91 | void oprofile_add_sample(struct pt_regs * const regs, unsigned long event); |
| 93 | 92 | ||