diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:09:22 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:09:22 +0000 |
commit | bc85e585c6d0fab4bde12d60964b2f25802c3163 (patch) | |
tree | 80f5fe916e3458d0676e595e3433a0313e7ba72b /arch/arm/oprofile/op_model_arm11_core.c | |
parent | 186f93ea1f274f4cde4a356401c1786c818ff881 (diff) | |
parent | 796d12959ad374cae8eb77faaf4243455a305433 (diff) | |
download | linux-bc85e585c6d0fab4bde12d60964b2f25802c3163.tar.bz2 |
Merge branch 'perf' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/oprofile/op_model_arm11_core.c')
-rw-r--r-- | arch/arm/oprofile/op_model_arm11_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/oprofile/op_model_arm11_core.c b/arch/arm/oprofile/op_model_arm11_core.c index ad80752cb9fb..ef3e2653b90c 100644 --- a/arch/arm/oprofile/op_model_arm11_core.c +++ b/arch/arm/oprofile/op_model_arm11_core.c @@ -132,7 +132,7 @@ static irqreturn_t arm11_pmu_interrupt(int irq, void *arg) return IRQ_HANDLED; } -int arm11_request_interrupts(int *irqs, int nr) +int arm11_request_interrupts(const int *irqs, int nr) { unsigned int i; int ret = 0; @@ -153,7 +153,7 @@ int arm11_request_interrupts(int *irqs, int nr) return ret; } -void arm11_release_interrupts(int *irqs, int nr) +void arm11_release_interrupts(const int *irqs, int nr) { unsigned int i; |