diff options
author | Mike Frysinger <michael.frysinger@analog.com> | 2007-07-24 23:57:42 -0400 |
---|---|---|
committer | Bryan Wu <bryan.wu@analog.com> | 2007-07-24 23:57:42 -0400 |
commit | d5148ffa600e6a655b458bedc593020e0574f967 (patch) | |
tree | e53d7e8c7e18eef3d4fe3077b3f68005d16f9bf0 /arch/blackfin/oprofile | |
parent | 60e9356d770ca3622fe5e84680b78fc376e53fbf (diff) |
Blackfin arch: use the [CS]SYNC() macros which include anomaly workarounds rather than __builtin_bfin_[cs]sync()
Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'arch/blackfin/oprofile')
-rw-r--r-- | arch/blackfin/oprofile/op_blackfin.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/blackfin/oprofile/op_blackfin.h b/arch/blackfin/oprofile/op_blackfin.h index f88f446c814f..05dd08c9d154 100644 --- a/arch/blackfin/oprofile/op_blackfin.h +++ b/arch/blackfin/oprofile/op_blackfin.h | |||
@@ -68,7 +68,7 @@ static inline unsigned int ctr_read(void) | |||
68 | unsigned int tmp; | 68 | unsigned int tmp; |
69 | 69 | ||
70 | tmp = bfin_read_PFCTL(); | 70 | tmp = bfin_read_PFCTL(); |
71 | __builtin_bfin_csync(); | 71 | CSYNC(); |
72 | 72 | ||
73 | return tmp; | 73 | return tmp; |
74 | } | 74 | } |
@@ -76,21 +76,21 @@ static inline unsigned int ctr_read(void) | |||
76 | static inline void ctr_write(unsigned int val) | 76 | static inline void ctr_write(unsigned int val) |
77 | { | 77 | { |
78 | bfin_write_PFCTL(val); | 78 | bfin_write_PFCTL(val); |
79 | __builtin_bfin_csync(); | 79 | CSYNC(); |
80 | } | 80 | } |
81 | 81 | ||
82 | static inline void count_read(unsigned int *count) | 82 | static inline void count_read(unsigned int *count) |
83 | { | 83 | { |
84 | count[0] = bfin_read_PFCNTR0(); | 84 | count[0] = bfin_read_PFCNTR0(); |
85 | count[1] = bfin_read_PFCNTR1(); | 85 | count[1] = bfin_read_PFCNTR1(); |
86 | __builtin_bfin_csync(); | 86 | CSYNC(); |
87 | } | 87 | } |
88 | 88 | ||
89 | static inline void count_write(unsigned int *count) | 89 | static inline void count_write(unsigned int *count) |
90 | { | 90 | { |
91 | bfin_write_PFCNTR0(count[0]); | 91 | bfin_write_PFCNTR0(count[0]); |
92 | bfin_write_PFCNTR1(count[1]); | 92 | bfin_write_PFCNTR1(count[1]); |
93 | __builtin_bfin_csync(); | 93 | CSYNC(); |
94 | } | 94 | } |
95 | 95 | ||
96 | extern int pm_overflow_handler(int irq, struct pt_regs *regs); | 96 | extern int pm_overflow_handler(int irq, struct pt_regs *regs); |