diff --git a/[refs] b/[refs] index ce12472e8089..8603a6e7f82b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd13f6c85144bb2026c534a35be1d7cb7628a64a +refs/heads/master: 58494487581cb143a0d763e3056a894d5009d60a diff --git a/trunk/include/linux/oprofile.h b/trunk/include/linux/oprofile.h index 5231861f357d..1ce9fe572e51 100644 --- a/trunk/include/linux/oprofile.h +++ b/trunk/include/linux/oprofile.h @@ -86,8 +86,7 @@ int oprofile_arch_init(struct oprofile_operations * ops); void oprofile_arch_exit(void); /** - * Add a sample. This may be called from any context. Pass - * smp_processor_id() as cpu. + * Add a sample. This may be called from any context. */ void oprofile_add_sample(struct pt_regs * const regs, unsigned long event);