[PATCH] x86: Coding style fixes to arch/x86/oprofile/op_model_p4.c

Previous thread: [PATCH] KVM x86_emulate.c: duplicate SrcImm by roel kluin on Monday, August 18, 2008 - 6:25 pm. (2 messages)

Next thread: latest -git: [x86/oprofile] BUG: using smp_processor_id() in preemptible by Vegard Nossum on Monday, August 18, 2008 - 12:42 pm. (1 message)
From: Paolo Ciarrocchi
Date: Monday, August 18, 2008 - 12:25 pm

Ingo, Robert,

From: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>

A coding style patch to arch/x86/oprofile/op_model_p4.c that
removes 87 errors and 4 warnings.

Before:
total: 89 errors, 13 warnings, 722 lines checked

After:
total: 2 errors, 9 warnings, 721 lines checked

Compile tested, binary verified as follow:

paolo@paolo-desktop:~/linux.trees.git$ size /tmp/op_model_p4.o.*
   text    data     bss     dec     hex filename
   2691     968      32    3691     e6b /tmp/op_model_p4.o.after
   2691     968      32    3691     e6b /tmp/op_model_p4.o.before

paolo@paolo-desktop:~/linux.trees.git$ md5sum /tmp/op_model_p4.o.*
8c1c9823bab33333e1f7f76574e62561  /tmp/op_model_p4.o.after
8c1c9823bab33333e1f7f76574e62561  /tmp/op_model_p4.o.before

Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
---
 arch/x86/oprofile/op_model_p4.c |  175 +++++++++++++++++++--------------------
 1 files changed, 87 insertions(+), 88 deletions(-)

diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c
index 56b4757..43ac5af 100644
--- a/arch/x86/oprofile/op_model_p4.c
+++ b/arch/x86/oprofile/op_model_p4.c
@@ -10,11 +10,12 @@
 
 #include <linux/oprofile.h>
 #include <linux/smp.h>
+#include <linux/ptrace.h>
+#include <linux/nmi.h>
 #include <asm/msr.h>
-#include <asm/ptrace.h>
 #include <asm/fixmap.h>
 #include <asm/apic.h>
-#include <asm/nmi.h>
+
 
 #include "op_x86_model.h"
 #include "op_counter.h"
@@ -40,7 +41,7 @@ static unsigned int num_controls = NUM_CONTROLS_NON_HT;
 static inline void setup_num_counters(void)
 {
 #ifdef CONFIG_SMP
-	if (smp_num_siblings == 2){
+	if (smp_num_siblings == 2) {
 		num_counters = NUM_COUNTERS_HT2;
 		num_controls = NUM_CONTROLS_HT2;
 	}
@@ -86,7 +87,7 @@ struct p4_event_binding {
 #define CTR_FLAME_2    (1 << 6)
 #define CTR_IQ_5       (1 << 7)
 
-static struct p4_counter_binding p4_counters [NUM_COUNTERS_NON_HT] = {
+static struct p4_counter_binding p4_counters[NUM_COUNTERS_NON_HT] = {
 	{ ...
From: Ingo Molnar
Date: Monday, August 18, 2008 - 6:44 pm

nice! Applied to tip/x86/oprofile and also merged into tip/oprofile, 
thanks Paolo.

	Ingo
--

Previous thread: [PATCH] KVM x86_emulate.c: duplicate SrcImm by roel kluin on Monday, August 18, 2008 - 6:25 pm. (2 messages)

Next thread: latest -git: [x86/oprofile] BUG: using smp_processor_id() in preemptible by Vegard Nossum on Monday, August 18, 2008 - 12:42 pm. (1 message)