[PATCH] powerpc: Merge ppc64 pmc.[ch] with ppc32 perfmon.[ch]

This patches the ppc32 and ppc64 versions of the headers and .c files
with helper functions for manipulating the performance counting
hardware.  As a side effect, it removes use of the term "perfmon" from
ppc32, thus avoiding confusion with the unrelated performance counter
interface from HP Labs also called "perfmon".

Built, but not booted, for g5, pSeries, iSeries, and 32-bit Powermac
with both ARCH=powerpc and ARCH=ppc{,64} as appropriate.

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 1 insertions, 89 deletions

diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
index 18f477fa1df2..6cce419f4b09 100644
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
@@ -17,7 +17,7 @@ obj-y               +=	irq.o idle.o dma.o \
 			udbg.o ioctl32.o \
 			rtc.o \
 			cpu_setup_power4.o \
-			iommu.o sysfs.o vdso.o pmc.o firmware.o
+			iommu.o sysfs.o vdso.o firmware.o
 obj-y += vdso32/ vdso64/
 
 pci-obj-$(CONFIG_PPC_MULTIPLATFORM)	+= pci_dn.o pci_direct_iommu.o
diff --git a/arch/ppc64/kernel/pmc.c b/arch/ppc64/kernel/pmc.c
deleted file mode 100644
index 944d7df7935f..000000000000
--- a/arch/ppc64/kernel/pmc.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *  linux/arch/ppc64/kernel/pmc.c
- *
- *  Copyright (C) 2004 David Gibson, IBM Corporation.
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version
- *  2 of the License, or (at your option) any later version.
- */
-
-#include <linux/config.h>
-#include <linux/errno.h>
-#include <linux/spinlock.h>
-#include <linux/module.h>
-
-#include <asm/processor.h>
-#include <asm/pmc.h>
-
-/* Ensure exceptions are disabled */
-static void dummy_perf(struct pt_regs *regs)
-{
-	unsigned int mmcr0 = mfspr(SPRN_MMCR0);
-
-	mmcr0 &= ~(MMCR0_PMXE|MMCR0_PMAO);
-	mtspr(SPRN_MMCR0, mmcr0);
-}
-
-static DEFINE_SPINLOCK(pmc_owner_lock);
-static void *pmc_owner_caller; /* mostly for debugging */
-perf_irq_t perf_irq = dummy_perf;
-
-int reserve_pmc_hardware(perf_irq_t new_perf_irq)
-{
-	int err = 0;
-
-	spin_lock(&pmc_owner_lock);
-
-	if (pmc_owner_caller) {
-		printk(KERN_WARNING "reserve_pmc_hardware: "
-		       "PMC hardware busy (reserved by caller %p)\n",
-		       pmc_owner_caller);
-		err = -EBUSY;
-		goto out;
-	}
-
-	pmc_owner_caller = __builtin_return_address(0);
-	perf_irq = new_perf_irq ? : dummy_perf;
-
- out:
-	spin_unlock(&pmc_owner_lock);
-	return err;
-}
-EXPORT_SYMBOL_GPL(reserve_pmc_hardware);
-
-void release_pmc_hardware(void)
-{
-	spin_lock(&pmc_owner_lock);
-
-	WARN_ON(! pmc_owner_caller);
-
-	pmc_owner_caller = NULL;
-	perf_irq = dummy_perf;
-
-	spin_unlock(&pmc_owner_lock);
-}
-EXPORT_SYMBOL_GPL(release_pmc_hardware);
-
-void power4_enable_pmcs(void)
-{
-	unsigned long hid0;
-
-	hid0 = mfspr(SPRN_HID0);
-	hid0 |= 1UL << (63 - 20);
-
-	/* POWER4 requires the following sequence */
-	asm volatile(
-		"sync\n"
-		"mtspr     %1, %0\n"
-		"mfspr     %0, %1\n"
-		"mfspr     %0, %1\n"
-		"mfspr     %0, %1\n"
-		"mfspr     %0, %1\n"
-		"mfspr     %0, %1\n"
-		"mfspr     %0, %1\n"
-		"isync" : "=&r" (hid0) : "i" (SPRN_HID0), "0" (hid0):
-		"memory");
-}