diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-07-14 12:13:41 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-07-14 12:13:41 -0400 |
| commit | 03fe805a098422d27cbbbad29a54ff1349da3622 (patch) | |
| tree | 0db9cc9a701203ddcee58e5b907d4fb8ad31b421 /include/linux/profile.h | |
| parent | 50dd9050e45ce11c575eabcaee8a914caf78fb74 (diff) | |
| parent | 5646eda5851e6cfdfa22d41895e3f5daffa643d3 (diff) | |
Merge branch 'topic/monotonic' into for-next
Diffstat (limited to 'include/linux/profile.h')
| -rw-r--r-- | include/linux/profile.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/profile.h b/include/linux/profile.h index aaad3861beb8..b537a25ffa17 100644 --- a/include/linux/profile.h +++ b/include/linux/profile.h | |||
| @@ -44,6 +44,7 @@ extern int prof_on __read_mostly; | |||
| 44 | int profile_init(void); | 44 | int profile_init(void); |
| 45 | int profile_setup(char *str); | 45 | int profile_setup(char *str); |
| 46 | void profile_tick(int type); | 46 | void profile_tick(int type); |
| 47 | int setup_profiling_timer(unsigned int multiplier); | ||
| 47 | 48 | ||
| 48 | /* | 49 | /* |
| 49 | * Add multiple profiler hits to a given address: | 50 | * Add multiple profiler hits to a given address: |