diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-19 07:50:07 -1000 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-19 07:50:07 -1000 |
commit | c4222e4635c6d6a689bf69e982f19c9d1ba261e1 (patch) | |
tree | 2e5954d33ff287da74029815355c353defd3abd0 /include/linux | |
parent | e99cfa2d0634881b8a41d56c48b5956b9a3ba162 (diff) | |
parent | 311b8935ad4e13bac5880ae3f0c269b0c253d25f (diff) | |
download | linux-stable-c4222e4635c6d6a689bf69e982f19c9d1ba261e1.tar.gz linux-stable-c4222e4635c6d6a689bf69e982f19c9d1ba261e1.tar.bz2 linux-stable-c4222e4635c6d6a689bf69e982f19c9d1ba261e1.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next
Pull sparc fixes from David Miller:
"Sparc sparse fixes from Sam Ravnborg"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next: (67 commits)
sparc64: fix sparse warnings in int_64.c
sparc64: fix sparse warning in ftrace.c
sparc64: fix sparse warning in kprobes.c
sparc64: fix sparse warning in kgdb_64.c
sparc64: fix sparse warnings in compat_audit.c
sparc64: fix sparse warnings in init_64.c
sparc64: fix sparse warnings in aes_glue.c
sparc: fix sparse warnings in smp_32.c + smp_64.c
sparc64: fix sparse warnings in perf_event.c
sparc64: fix sparse warnings in kprobes.c
sparc64: fix sparse warning in tsb.c
sparc64: clean up compat_sigset_t.seta handling
sparc64: fix sparse "Should it be static?" warnings in signal32.c
sparc64: fix sparse warnings in sys_sparc32.c
sparc64: fix sparse warning in pci.c
sparc64: fix sparse warnings in smp_64.c
sparc64: fix sparse warning in prom_64.c
sparc64: fix sparse warning in btext.c
sparc64: fix sparse warnings in sys_sparc_64.c + unaligned_64.c
sparc64: fix sparse warning in process_64.c
...
Conflicts:
arch/sparc/include/asm/pgtable_64.h
Diffstat (limited to 'include/linux')
-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; int profile_init(void); int profile_setup(char *str); void profile_tick(int type); +int setup_profiling_timer(unsigned int multiplier); /* * Add multiple profiler hits to a given address: |