diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2013-01-22 06:59:30 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-02-01 04:00:22 -0500 |
commit | 7034228792cc561e79ff8600f02884bd4c80e287 (patch) | |
tree | 89b77af37d087d9de236fc5d21f60bf552d0a2c6 /arch/mips/oprofile | |
parent | 405ab01c70e18058d9c01a1256769a61fc65413e (diff) |
MIPS: Whitespace cleanup.
Having received another series of whitespace patches I decided to do this
once and for all rather than dealing with this kind of patches trickling
in forever.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/oprofile')
-rw-r--r-- | arch/mips/oprofile/common.c | 6 | ||||
-rw-r--r-- | arch/mips/oprofile/op_model_loongson2.c | 10 | ||||
-rw-r--r-- | arch/mips/oprofile/op_model_mipsxx.c | 34 |
3 files changed, 25 insertions, 25 deletions
diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c index e32db1ff02c7..56f2cf221c7d 100644 --- a/arch/mips/oprofile/common.c +++ b/arch/mips/oprofile/common.c | |||
@@ -27,10 +27,10 @@ static int op_mips_setup(void) | |||
27 | /* Pre-compute the values to stuff in the hardware registers. */ | 27 | /* Pre-compute the values to stuff in the hardware registers. */ |
28 | model->reg_setup(ctr); | 28 | model->reg_setup(ctr); |
29 | 29 | ||
30 | /* Configure the registers on all cpus. */ | 30 | /* Configure the registers on all cpus. */ |
31 | on_each_cpu(model->cpu_setup, NULL, 1); | 31 | on_each_cpu(model->cpu_setup, NULL, 1); |
32 | 32 | ||
33 | return 0; | 33 | return 0; |
34 | } | 34 | } |
35 | 35 | ||
36 | static int op_mips_create_files(struct super_block *sb, struct dentry *root) | 36 | static int op_mips_create_files(struct super_block *sb, struct dentry *root) |
@@ -110,7 +110,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) | |||
110 | 110 | ||
111 | ops->create_files = op_mips_create_files; | 111 | ops->create_files = op_mips_create_files; |
112 | ops->setup = op_mips_setup; | 112 | ops->setup = op_mips_setup; |
113 | //ops->shutdown = op_mips_shutdown; | 113 | //ops->shutdown = op_mips_shutdown; |
114 | ops->start = op_mips_start; | 114 | ops->start = op_mips_start; |
115 | ops->stop = op_mips_stop; | 115 | ops->stop = op_mips_stop; |
116 | ops->cpu_type = lmodel->cpu_type; | 116 | ops->cpu_type = lmodel->cpu_type; |
diff --git a/arch/mips/oprofile/op_model_loongson2.c b/arch/mips/oprofile/op_model_loongson2.c index 60d3ea602118..b249ec0bebb2 100644 --- a/arch/mips/oprofile/op_model_loongson2.c +++ b/arch/mips/oprofile/op_model_loongson2.c | |||
@@ -18,13 +18,13 @@ | |||
18 | 18 | ||
19 | #define LOONGSON2_CPU_TYPE "mips/loongson2" | 19 | #define LOONGSON2_CPU_TYPE "mips/loongson2" |
20 | 20 | ||
21 | #define LOONGSON2_PERFCNT_OVERFLOW (1ULL << 31) | 21 | #define LOONGSON2_PERFCNT_OVERFLOW (1ULL << 31) |
22 | 22 | ||
23 | #define LOONGSON2_PERFCTRL_EXL (1UL << 0) | 23 | #define LOONGSON2_PERFCTRL_EXL (1UL << 0) |
24 | #define LOONGSON2_PERFCTRL_KERNEL (1UL << 1) | 24 | #define LOONGSON2_PERFCTRL_KERNEL (1UL << 1) |
25 | #define LOONGSON2_PERFCTRL_SUPERVISOR (1UL << 2) | 25 | #define LOONGSON2_PERFCTRL_SUPERVISOR (1UL << 2) |
26 | #define LOONGSON2_PERFCTRL_USER (1UL << 3) | 26 | #define LOONGSON2_PERFCTRL_USER (1UL << 3) |
27 | #define LOONGSON2_PERFCTRL_ENABLE (1UL << 4) | 27 | #define LOONGSON2_PERFCTRL_ENABLE (1UL << 4) |
28 | #define LOONGSON2_PERFCTRL_EVENT(idx, event) \ | 28 | #define LOONGSON2_PERFCTRL_EVENT(idx, event) \ |
29 | (((event) & 0x0f) << ((idx) ? 9 : 5)) | 29 | (((event) & 0x0f) << ((idx) ? 9 : 5)) |
30 | 30 | ||
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c index 786254630403..1cfab95755b9 100644 --- a/arch/mips/oprofile/op_model_mipsxx.c +++ b/arch/mips/oprofile/op_model_mipsxx.c | |||
@@ -14,25 +14,25 @@ | |||
14 | 14 | ||
15 | #include "op_impl.h" | 15 | #include "op_impl.h" |
16 | 16 | ||
17 | #define M_PERFCTL_EXL (1UL << 0) | 17 | #define M_PERFCTL_EXL (1UL << 0) |
18 | #define M_PERFCTL_KERNEL (1UL << 1) | 18 | #define M_PERFCTL_KERNEL (1UL << 1) |
19 | #define M_PERFCTL_SUPERVISOR (1UL << 2) | 19 | #define M_PERFCTL_SUPERVISOR (1UL << 2) |
20 | #define M_PERFCTL_USER (1UL << 3) | 20 | #define M_PERFCTL_USER (1UL << 3) |
21 | #define M_PERFCTL_INTERRUPT_ENABLE (1UL << 4) | 21 | #define M_PERFCTL_INTERRUPT_ENABLE (1UL << 4) |
22 | #define M_PERFCTL_EVENT(event) (((event) & 0x3ff) << 5) | 22 | #define M_PERFCTL_EVENT(event) (((event) & 0x3ff) << 5) |
23 | #define M_PERFCTL_VPEID(vpe) ((vpe) << 16) | 23 | #define M_PERFCTL_VPEID(vpe) ((vpe) << 16) |
24 | #define M_PERFCTL_MT_EN(filter) ((filter) << 20) | 24 | #define M_PERFCTL_MT_EN(filter) ((filter) << 20) |
25 | #define M_TC_EN_ALL M_PERFCTL_MT_EN(0) | 25 | #define M_TC_EN_ALL M_PERFCTL_MT_EN(0) |
26 | #define M_TC_EN_VPE M_PERFCTL_MT_EN(1) | 26 | #define M_TC_EN_VPE M_PERFCTL_MT_EN(1) |
27 | #define M_TC_EN_TC M_PERFCTL_MT_EN(2) | 27 | #define M_TC_EN_TC M_PERFCTL_MT_EN(2) |
28 | #define M_PERFCTL_TCID(tcid) ((tcid) << 22) | 28 | #define M_PERFCTL_TCID(tcid) ((tcid) << 22) |
29 | #define M_PERFCTL_WIDE (1UL << 30) | 29 | #define M_PERFCTL_WIDE (1UL << 30) |
30 | #define M_PERFCTL_MORE (1UL << 31) | 30 | #define M_PERFCTL_MORE (1UL << 31) |
31 | 31 | ||
32 | #define M_COUNTER_OVERFLOW (1UL << 31) | 32 | #define M_COUNTER_OVERFLOW (1UL << 31) |
33 | 33 | ||
34 | /* Netlogic XLR specific, count events in all threads in a core */ | 34 | /* Netlogic XLR specific, count events in all threads in a core */ |
35 | #define M_PERFCTL_COUNT_ALL_THREADS (1UL << 13) | 35 | #define M_PERFCTL_COUNT_ALL_THREADS (1UL << 13) |
36 | 36 | ||
37 | static int (*save_perf_irq)(void); | 37 | static int (*save_perf_irq)(void); |
38 | 38 | ||
@@ -143,7 +143,7 @@ static struct mipsxx_register_config { | |||
143 | unsigned int counter[4]; | 143 | unsigned int counter[4]; |
144 | } reg; | 144 | } reg; |
145 | 145 | ||
146 | /* Compute all of the registers in preparation for enabling profiling. */ | 146 | /* Compute all of the registers in preparation for enabling profiling. */ |
147 | 147 | ||
148 | static void mipsxx_reg_setup(struct op_counter_config *ctr) | 148 | static void mipsxx_reg_setup(struct op_counter_config *ctr) |
149 | { | 149 | { |
@@ -159,7 +159,7 @@ static void mipsxx_reg_setup(struct op_counter_config *ctr) | |||
159 | continue; | 159 | continue; |
160 | 160 | ||
161 | reg.control[i] = M_PERFCTL_EVENT(ctr[i].event) | | 161 | reg.control[i] = M_PERFCTL_EVENT(ctr[i].event) | |
162 | M_PERFCTL_INTERRUPT_ENABLE; | 162 | M_PERFCTL_INTERRUPT_ENABLE; |
163 | if (ctr[i].kernel) | 163 | if (ctr[i].kernel) |
164 | reg.control[i] |= M_PERFCTL_KERNEL; | 164 | reg.control[i] |= M_PERFCTL_KERNEL; |
165 | if (ctr[i].user) | 165 | if (ctr[i].user) |
@@ -172,7 +172,7 @@ static void mipsxx_reg_setup(struct op_counter_config *ctr) | |||
172 | } | 172 | } |
173 | } | 173 | } |
174 | 174 | ||
175 | /* Program all of the registers in preparation for enabling profiling. */ | 175 | /* Program all of the registers in preparation for enabling profiling. */ |
176 | 176 | ||
177 | static void mipsxx_cpu_setup(void *args) | 177 | static void mipsxx_cpu_setup(void *args) |
178 | { | 178 | { |