mirror of
https://github.com/torvalds/linux.git
synced 2025-11-04 02:30:34 +02:00
92fb83afd6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile: (21 commits)
OProfile: Fix buffer synchronization for IBS
oprofile: hotplug cpu fix
oprofile: fixing whitespaces in arch/x86/oprofile/*
oprofile: fixing whitespaces in arch/x86/oprofile/*
oprofile: fixing whitespaces in drivers/oprofile/*
x86/oprofile: add the logic for enabling additional IBS bits
x86/oprofile: reordering functions in nmi_int.c
x86/oprofile: removing unused function parameter in add_ibs_begin()
oprofile: more whitespace fixes
oprofile: whitespace fixes
OProfile: Rename IBS sysfs dir into "ibs_op"
OProfile: Rework string handling in setup_ibs_files()
OProfile: Rework oprofile_add_ibs_sample() function
oprofile: discover counters for op ppro too
oprofile: Implement Intel architectural perfmon support
oprofile: Don't report Nehalem as core_2
oprofile: drop const in num counters field
Revert "Oprofile Multiplexing Patch"
x86, oprofile: BUG: using smp_processor_id() in preemptible code
x86/oprofile: fix on_each_cpu build error
...
Manually fixed trivial conflicts in
drivers/oprofile/{cpu_buffer.c,event_buffer.h}
40 lines
858 B
C
40 lines
858 B
C
/**
|
|
* @file event_buffer.h
|
|
*
|
|
* @remark Copyright 2002 OProfile authors
|
|
* @remark Read the file COPYING
|
|
*
|
|
* @author John Levon <levon@movementarian.org>
|
|
*/
|
|
|
|
#ifndef EVENT_BUFFER_H
|
|
#define EVENT_BUFFER_H
|
|
|
|
#include <linux/types.h>
|
|
#include <asm/mutex.h>
|
|
|
|
int alloc_event_buffer(void);
|
|
|
|
void free_event_buffer(void);
|
|
|
|
/**
|
|
* Add data to the event buffer.
|
|
* The data passed is free-form, but typically consists of
|
|
* file offsets, dcookies, context information, and ESCAPE codes.
|
|
*/
|
|
void add_event_entry(unsigned long data);
|
|
|
|
/* wake up the process sleeping on the event file */
|
|
void wake_up_buffer_waiter(void);
|
|
|
|
#define INVALID_COOKIE ~0UL
|
|
#define NO_COOKIE 0UL
|
|
|
|
extern const struct file_operations event_buffer_fops;
|
|
|
|
/* mutex between sync_cpu_buffers() and the
|
|
* file reading code.
|
|
*/
|
|
extern struct mutex buffer_mutex;
|
|
|
|
#endif /* EVENT_BUFFER_H */
|