diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-11 18:59:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-11 18:59:45 -0700 |
| commit | 409ab140e2ec662e473d4968e12b7ac97f5a5f4e (patch) | |
| tree | b6ddbb6ea24387b912706790cbd9302db01c3d5d /arch/s390/oprofile/hwsampler.h | |
| parent | ce8453776d68982cfe93bcb28191af8ccad01f45 (diff) | |
| parent | badb8bb983e9cf5b7a872e0a4f6ebeac2b1ce133 (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] fix alloc_pgste check in init_new_context
[S390] oprofile: fix min/max interval query checks
[S390] replace diag10() with diag10_range() function
[S390] disassembler: handle b280/spp instruction
[S390] kernel: Initialize register 14 when starting new CPU
[S390] dasd: prevent IO error during reserve/release loop
[S390] sclp/memory hotplug: fix initial usecount of increments
Diffstat (limited to 'arch/s390/oprofile/hwsampler.h')
| -rw-r--r-- | arch/s390/oprofile/hwsampler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/oprofile/hwsampler.h b/arch/s390/oprofile/hwsampler.h index 8c72b59316b..1912f3bb190 100644 --- a/arch/s390/oprofile/hwsampler.h +++ b/arch/s390/oprofile/hwsampler.h @@ -102,8 +102,8 @@ int hwsampler_setup(void); int hwsampler_shutdown(void); int hwsampler_allocate(unsigned long sdbt, unsigned long sdb); int hwsampler_deallocate(void); -long hwsampler_query_min_interval(void); -long hwsampler_query_max_interval(void); +unsigned long hwsampler_query_min_interval(void); +unsigned long hwsampler_query_max_interval(void); int hwsampler_start_all(unsigned long interval); int hwsampler_stop_all(void); int hwsampler_deactivate(unsigned int cpu); |