diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-01-09 03:12:55 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-09 03:12:55 +0100 |
commit | ca371d2854d48c0c22e7aa031df182f96dc85820 (patch) | |
tree | 1c62be8b4da0bfc82fa7ffa1ad5b0e958266cbd1 /arch/arm/kernel/pmu.c | |
parent | Merge branches 'common/clkfwk', 'common/pfc' and 'common/serial-rework' into ... (diff) | |
parent | audit: always follow va_copy() with va_end() (diff) | |
download | linux-ca371d2854d48c0c22e7aa031df182f96dc85820.tar.xz linux-ca371d2854d48c0c22e7aa031df182f96dc85820.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Conflicts:
arch/arm/mach-shmobile/clock-sh73a0.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/kernel/pmu.c')
-rw-r--r-- | arch/arm/kernel/pmu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/pmu.c b/arch/arm/kernel/pmu.c index 2c3407ee8576..2334bf8a650a 100644 --- a/arch/arm/kernel/pmu.c +++ b/arch/arm/kernel/pmu.c @@ -33,3 +33,4 @@ release_pmu(enum arm_pmu_type type) { clear_bit_unlock(type, pmu_lock); } +EXPORT_SYMBOL_GPL(release_pmu); |