Simple whitespace and comment cleanups.
Signed-off-by: Kevin Corry <[EMAIL PROTECTED]>
---
arch/i386/perfmon/perfmon.c | 6 +++---
arch/i386/perfmon/perfmon_intel_arch.c | 2 +-
arch/ia64/perfmon/perfmon_compat.c | 2 +-
arch/powerpc/perfmon/Kconfig | 16 ++++++++--------
arch/powerpc/perfmon/perfmon.c | 9 ++++-----
arch/powerpc/perfmon/perfmon_cell.c | 6 ++----
include/asm-i386/perfmon.h | 2 +-
include/asm-ia64/perfmon.h | 2 +-
include/asm-mips/perfmon.h | 2 +-
include/asm-powerpc/perfmon.h | 5 ++---
include/asm-powerpc/perfmon_const.h | 2 +-
include/linux/perfmon.h | 2 +-
include/linux/perfmon_dfl_smpl.h | 2 +-
include/linux/perfmon_fmt.h | 2 +-
include/linux/perfmon_pmu.h | 6 +++---
perfmon/perfmon.c | 6 +++---
perfmon/perfmon_file.c | 2 +-
perfmon/perfmon_fmt.c | 2 +-
perfmon/perfmon_intr.c | 4 ++--
perfmon/perfmon_pmu.c | 2 +-
perfmon/perfmon_rw.c | 2 +-
perfmon/perfmon_sets.c | 2 +-
perfmon/perfmon_syscalls.c | 2 +-
perfmon/perfmon_sysfs.c | 5 ++---
24 files changed, 44 insertions(+), 49 deletions(-)
diff --git a/arch/i386/perfmon/perfmon.c b/arch/i386/perfmon/perfmon.c
index 7d72d5a..9268e61 100644
--- a/arch/i386/perfmon/perfmon.c
+++ b/arch/i386/perfmon/perfmon.c
@@ -134,7 +134,7 @@ static void __kprobes __pfm_arch_quiesce_pmu_percpu(void)
/*
* quiesce PMU by clearing registers that have enable bits
- * (start/stop capabilities).
+ * (start/stop capabilities).
*/
for (i = 0; i < arch_info->max_ena; i++)
if (test_bit(i, cast_ulp(arch_info->enable_mask)))
@@ -865,7 +865,7 @@ static int __kprobes pfm_has_ovfl_p4(struct pfm_context
*ctx)
n = bitmap_weight(cast_ulp(ena_mask), arch_info->max_ena);
for(i=0; n; i++) {
- if (!test_bit(i, cast_ulp(ena_mask)))
+ if (!test_bit(i, cast_ulp(ena_mask)))
continue;
/*
* controlled counter
@@ -904,7 +904,7 @@ static int __kprobes pfm_has_ovfl_p4(struct pfm_context
*ctx)
*/
if (unlikely(!ctx_arch->p4->npend_ovfls)) {
for(i=0; n; i++) {
- if (!test_bit(i, cast_ulp(ena_mask)))
+ if (!test_bit(i, cast_ulp(ena_mask)))
continue;
__pfm_write_reg_p4(xrc+i, ctx_arch->p4->saved_cccrs[i]);
}
diff --git a/arch/i386/perfmon/perfmon_intel_arch.c
b/arch/i386/perfmon/perfmon_intel_arch.c
index 11a0e62..d0a3e20 100644
--- a/arch/i386/perfmon/perfmon_intel_arch.c
+++ b/arch/i386/perfmon/perfmon_intel_arch.c
@@ -212,7 +212,7 @@ static int pfm_intel_arch_probe_pmu(void)
eax.eax.cnt_width = 31;
}
- /*
+ /*
* some 6/15 models have buggy BIOS
*/
if (eax.eax.version == 0 && cpu_data->x86 == 6 && cpu_data->x86_model
== 15) {
diff --git a/arch/ia64/perfmon/perfmon_compat.c
b/arch/ia64/perfmon/perfmon_compat.c
index ac2e26f..8d15135 100644
--- a/arch/ia64/perfmon/perfmon_compat.c
+++ b/arch/ia64/perfmon/perfmon_compat.c
@@ -1124,7 +1124,7 @@ ssize_t pfm_arch_compat_read(struct pfm_context *ctx,
}
ret = __pfm_read(ctx, &msg_buf, non_block);
- if (ret < 1)
+ if (ret < 1)
return ret;
/*
diff --git a/arch/powerpc/perfmon/Kconfig b/arch/powerpc/perfmon/Kconfig
index 0df3b52..ea8a81a 100644
--- a/arch/powerpc/perfmon/Kconfig
+++ b/arch/powerpc/perfmon/Kconfig
@@ -3,20 +3,20 @@ config PERFMON
bool "Perfmon2 performance monitoring interface"
default n
help
- Enables the perfmon2 interface to access the hardware
+ Enables the perfmon2 interface to access the hardware
performance counters. See <http://perfmon2.sf.net/> for
- more details.
+ more details.
config PERFMON_DEBUG
- bool "Perfmon debugging"
+ bool "Perfmon debugging"
default n
depends on PERFMON
- help
- Enables perfmon debugging support
+ help
+ Enables perfmon debugging support
config PERFMON_POWER5
tristate "Support for Power5 hardware performance counters"
- depends on PERFMON && PPC64
+ depends on PERFMON && PPC64
default n
help
Enables support for the Power 5 hardware performance counters
@@ -24,7 +24,7 @@ config PERFMON_POWER5
config PERFMON_PPC32
tristate "Support for PPC32 hardware performance counters"
- depends on PERFMON && PPC32
+ depends on PERFMON && PPC32
default n
help
Enables support for the PPC32 hardware performance counters
@@ -32,7 +32,7 @@ config PERFMON_PPC32
config PERFMON_CELL
tristate "Support for Cell hardware performance counters"
- depends on PERFMON && PPC_CELL
+ depends on PERFMON && PPC_CELL
default n
help
Enables support for the Cell hardware performance counters.
diff --git a/arch/powerpc/perfmon/perfmon.c b/arch/powerpc/perfmon/perfmon.c
index cc9b73a..91b4033 100644
--- a/arch/powerpc/perfmon/perfmon.c
+++ b/arch/powerpc/perfmon/perfmon.c
@@ -122,19 +122,18 @@ void pfm_arch_stop(struct task_struct *task,
}
/*
- * called from pfm_start() and idle notifier
+ * Enable active monitoring. Called from pfm_start() and
+ * pfm_arch_unmask_monitoring().
*
* Interrupts are masked. Context is locked. Set is the active set.
*
* For per-thread:
* Task is not necessarily current. If not current task, then task
- * is guaranteed stopped and off any cpu. No access to PMU is task
+ * is guaranteed stopped and off any cpu. No access to PMU if task
* is not current.
*
* For system-wide:
- * task is always current
- *
- * must enable active monitoring.
+ * Task is always current
*/
void pfm_arch_start(struct task_struct *task,
struct pfm_context *ctx, struct pfm_event_set *set)
diff --git a/arch/powerpc/perfmon/perfmon_cell.c
b/arch/powerpc/perfmon/perfmon_cell.c
index 8b4e3ac..42247d9 100644
--- a/arch/powerpc/perfmon/perfmon_cell.c
+++ b/arch/powerpc/perfmon/perfmon_cell.c
@@ -457,8 +457,6 @@ static void pfm_cell_get_ovfl_pmds(struct pfm_context *ctx,
* perf_irq_handler() routine, which reads and saves the pm_status register.
* This routine should not read the actual pm_status register, but rather
* the value passed in.
- *
- * FIX: We don't necessarily need all these parameters.
**/
static void handle_trace_buffer_interrupts(unsigned long iip,
struct pt_regs *regs,
@@ -488,8 +486,8 @@ static void pfm_cell_irq_handler(struct pt_regs *regs,
struct pfm_context *ctx)
cbe_disable_pm(cpu);
/* Read the pm_status register to get the interrupt bits. If a
- * perfmormance counter interrupt occurred, call the core perfmon
- * interrupt handler to service the counter overflow. If the
+ * perfmormance counter overflow interrupt occurred, call the core
+ * perfmon interrupt handler to service the counter overflow. If the
* interrupt was for the interval timer or the trace_buffer,
* call the interval timer and trace buffer interrupt handler.
*
diff --git a/include/asm-i386/perfmon.h b/include/asm-i386/perfmon.h
index 93fb432..02440aa 100644
--- a/include/asm-i386/perfmon.h
+++ b/include/asm-i386/perfmon.h
@@ -428,7 +428,7 @@ static inline void pfm_arch_context_free(struct pfm_context
*ctx)
ctx_arch = pfm_ctx_arch(ctx);
- /*
+ /*
* we do not check if P4, because it would be NULL and
* kfree can deal with NULL
*/
diff --git a/include/asm-ia64/perfmon.h b/include/asm-ia64/perfmon.h
index e194726..98556a2 100644
--- a/include/asm-ia64/perfmon.h
+++ b/include/asm-ia64/perfmon.h
@@ -185,7 +185,7 @@ static inline void pfm_arch_ctxswin_sys(struct task_struct
*task,
* On IA-64, the PMDs are NOT saved by pfm_arch_freeze_pmu()
* when entering the PMU interrupt handler, thus, we need
* to save them in pfm_switch_sets_from_intr()
- */
+ */
static inline void pfm_arch_save_pmds_from_intr(struct pfm_context *ctx,
struct pfm_event_set *set)
{
diff --git a/include/asm-mips/perfmon.h b/include/asm-mips/perfmon.h
index 385f73b..6c1baaf 100644
--- a/include/asm-mips/perfmon.h
+++ b/include/asm-mips/perfmon.h
@@ -368,7 +368,7 @@ static inline void pfm_arch_pmu_release(void)
#ifdef CONFIG_PERFMON_FLUSH
/*
- * due to cache aliasing problem on MIPS, it is necessary to flush
+ * due to cache aliasing problem on MIPS, it is necessary to flush
* pages out of the cache when they are modified.
*/
static inline void pfm_cacheflush(void *addr, unsigned int len)
diff --git a/include/asm-powerpc/perfmon.h b/include/asm-powerpc/perfmon.h
index 41c40e4..e6af58f 100644
--- a/include/asm-powerpc/perfmon.h
+++ b/include/asm-powerpc/perfmon.h
@@ -243,8 +243,7 @@ static inline void pfm_arch_mask_monitoring(struct
pfm_context *ctx,
{}
/*
- * on x86 masking/unmasking uses the start/stop mechanism, so we simply
- * need to start here.
+ * Simply need to start the context in order to unmask.
*/
static inline void pfm_arch_unmask_monitoring(struct pfm_context *ctx,
struct pfm_event_set *set)
@@ -270,7 +269,7 @@ static inline int pfm_arch_context_create(struct
pfm_context *ctx,
static inline void pfm_arch_context_free(struct pfm_context *ctx)
{}
-/* not necessary on IA-64 */
+/* not necessary on PowerPC */
static inline void pfm_cacheflush(void *addr, unsigned int len)
{}
diff --git a/include/asm-powerpc/perfmon_const.h
b/include/asm-powerpc/perfmon_const.h
index 0540297..8313cea 100644
--- a/include/asm-powerpc/perfmon_const.h
+++ b/include/asm-powerpc/perfmon_const.h
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
- */
+ */
#ifndef _ASM_POWERPC_PERFMON_CONST_H_
#define _ASM_POWERPC_PERFMON_CONST_H_
diff --git a/include/linux/perfmon.h b/include/linux/perfmon.h
index 1f1023e..631cfca 100644
--- a/include/linux/perfmon.h
+++ b/include/linux/perfmon.h
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
- */
+ */
#ifndef __LINUX_PERFMON_H__
#define __LINUX_PERFMON_H__
diff --git a/include/linux/perfmon_dfl_smpl.h b/include/linux/perfmon_dfl_smpl.h
index 500c673..2a34b1b 100644
--- a/include/linux/perfmon_dfl_smpl.h
+++ b/include/linux/perfmon_dfl_smpl.h
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
- */
+ */
#ifndef __PERFMON_DFL_SMPL_H__
#define __PERFMON_DFL_SMPL_H__ 1
diff --git a/include/linux/perfmon_fmt.h b/include/linux/perfmon_fmt.h
index 30a916b..d459538 100644
--- a/include/linux/perfmon_fmt.h
+++ b/include/linux/perfmon_fmt.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
- */
+ */
#ifndef __PERFMON_FMT_H__
#define __PERFMON_FMT_H__ 1
diff --git a/include/linux/perfmon_pmu.h b/include/linux/perfmon_pmu.h
index c59d268..7585e34 100644
--- a/include/linux/perfmon_pmu.h
+++ b/include/linux/perfmon_pmu.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
- */
+ */
#ifndef __PERFMON_PMU_H__
#define __PERFMON_PMU_H__ 1
@@ -47,7 +47,7 @@ struct pfm_regmap_desc {
.rsvd_msk = r, \
.no_emul64_msk = n, \
.hw_addr = h \
- }
+ }
#define PMD_D(t,d, h) \
{ .type = t, \
@@ -55,7 +55,7 @@ struct pfm_regmap_desc {
.rsvd_msk = 0, \
.no_emul64_msk = 0, \
.hw_addr = h \
- }
+ }
#define PMX_NA \
{ .type = PFM_REG_NA }
diff --git a/perfmon/perfmon.c b/perfmon/perfmon.c
index bdda34b..ff0765a 100644
--- a/perfmon/perfmon.c
+++ b/perfmon/perfmon.c
@@ -275,7 +275,7 @@ int pfm_smpl_buffer_alloc(struct pfm_context *ctx, size_t
rsize)
* align the useable sampling buffer address to the arch requirement
* This is a nop on most architectures
*/
-#if PFM_ARCH_SMPL_ALIGN_SIZE > 0
+#if PFM_ARCH_SMPL_ALIGN_SIZE > 0
addr = PFM_ALIGN_SMPL((unsigned long)real_addr,
PFM_ARCH_SMPL_ALIGN_SIZE);
#endif
@@ -494,7 +494,7 @@ static void pfm_flush_pmds(struct task_struct *task, struct
pfm_context *ctx)
set->pmds[i].value += 1 + ovfl_mask;
num_ovfls--;
PFM_DBG("pmd%u overflowed", i);
- }
+ }
PFM_DBG("pmd%u set=%u val=0x%llx",
i,
set->id,
@@ -1673,7 +1673,7 @@ error_set:
put_filp(filp);
put_unused_fd(fd);
error_file:
- /*
+ /*
* calls the right *_put() functions
* calls pfm_release_pmu()
*/
diff --git a/perfmon/perfmon_file.c b/perfmon/perfmon_file.c
index 518b4b2..1f07a3e 100644
--- a/perfmon/perfmon_file.c
+++ b/perfmon/perfmon_file.c
@@ -359,7 +359,7 @@ static ssize_t pfm_read(struct file *filp, char __user
*buf, size_t size,
ret = __pfm_read(ctx, &msg_buf, non_block);
if (ret > 0) {
- if(copy_to_user(buf, &msg_buf, sizeof(msg_buf)))
+ if (copy_to_user(buf, &msg_buf, sizeof(msg_buf)))
ret = -EFAULT;
}
PFM_DBG_ovfl("ret=%d", ret);
diff --git a/perfmon/perfmon_fmt.c b/perfmon/perfmon_fmt.c
index 92d19df..8f9328a 100644
--- a/perfmon/perfmon_fmt.c
+++ b/perfmon/perfmon_fmt.c
@@ -34,7 +34,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
- */
+ */
#include <linux/module.h>
#include <linux/perfmon.h>
diff --git a/perfmon/perfmon_intr.c b/perfmon/perfmon_intr.c
index a81fade..ba23be5 100644
--- a/perfmon/perfmon_intr.c
+++ b/perfmon/perfmon_intr.c
@@ -34,7 +34,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
- */
+ */
#include <linux/kernel.h>
#include <linux/perfmon.h>
#include <linux/module.h>
@@ -186,7 +186,7 @@ static void pfm_overflow_handler(struct pfm_context *ctx,
struct pfm_event_set *
/* only keep track of 64-bit overflows */
__clear_bit(i, cast_ulp(pend_ovfls));
/*
- * on some PMU, it may be necessary to re-arm the PMD
+ * on some PMU, it may be necessary to re-arm the PMD
*/
pfm_arch_ovfl_reset_pmd(ctx, i);
}
diff --git a/perfmon/perfmon_pmu.c b/perfmon/perfmon_pmu.c
index 58f5e95..5e3cdca 100644
--- a/perfmon/perfmon_pmu.c
+++ b/perfmon/perfmon_pmu.c
@@ -34,7 +34,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
- */
+ */
#include <linux/module.h>
#include <linux/perfmon.h>
diff --git a/perfmon/perfmon_rw.c b/perfmon/perfmon_rw.c
index 7e3e8f3..73e60e4 100644
--- a/perfmon/perfmon_rw.c
+++ b/perfmon/perfmon_rw.c
@@ -121,7 +121,7 @@ int __pfm_write_pmds(struct pfm_context *ctx, struct
pfarg_pmd *req, int count,
* non counting PMD may trigger PMU interrupt
* and thus may trigger recording of a sample.
* This is the case with AMD family 16 and the
- * IBS feature, for instance.
+ * IBS feature, for instance.
*/
if (req_flags & PFM_REGFL_OVFL_NOTIFY)
flags |= PFM_REGFL_OVFL_NOTIFY;
diff --git a/perfmon/perfmon_sets.c b/perfmon/perfmon_sets.c
index 016193c..62dfc59 100644
--- a/perfmon/perfmon_sets.c
+++ b/perfmon/perfmon_sets.c
@@ -34,7 +34,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
- */
+ */
#include <linux/kernel.h>
#include <linux/perfmon.h>
#include <linux/pagemap.h>
diff --git a/perfmon/perfmon_syscalls.c b/perfmon/perfmon_syscalls.c
index 3839cfb..3aa3deb 100644
--- a/perfmon/perfmon_syscalls.c
+++ b/perfmon/perfmon_syscalls.c
@@ -91,7 +91,7 @@ static int pfm_task_incompatible(struct pfm_context *ctx,
struct task_struct *ta
}
/*
- * cannot use block on notification when
+ * cannot use block on notification when
* self-monitoring.
*/
if (ctx->flags.block && task == current) {
diff --git a/perfmon/perfmon_sysfs.c b/perfmon/perfmon_sysfs.c
index eeb54e4..7658cf3 100644
--- a/perfmon/perfmon_sysfs.c
+++ b/perfmon/perfmon_sysfs.c
@@ -1,5 +1,4 @@
/*
- * pfm_kernel_kobj.ktype =
* perfmon_sysfs.c: perfmon2 sysfs interface
*
* This file implements the perfmon2 interface which
@@ -35,7 +34,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
* 02111-1307 USA
- */
+ */
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/smp_lock.h>
@@ -875,7 +874,7 @@ int pfm_sysfs_add_pmu(struct pfm_pmu_config *pmu)
ret = pfm_sysfs_add_pmu_regs(pmu);
if (ret) {
sysfs_remove_group(&pmu->kobj, &pfm_pmu_desc_attr_group);
- kobject_del(&pmu->kobj);
+ kobject_del(&pmu->kobj);
}
return ret;
}
_______________________________________________
perfmon mailing list
[email protected]
http://www.hpl.hp.com/hosted/linux/mail-archives/perfmon/
