git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timer: parenthesis fix in tbase_get_deferrable() etc
[sfrench/cifs-2.6.git]
/
kernel
/
timer.c
diff --git
a/kernel/timer.c
b/kernel/timer.c
index 7a6448340f9032d798cb470c0d028a5f13aaaa68..58f6dd07c80bda6083ecf2c9dd6e7dfac4517bbe 100644
(file)
--- a/
kernel/timer.c
+++ b/
kernel/timer.c
@@
-92,24
+92,24
@@
static DEFINE_PER_CPU(tvec_base_t *, tvec_bases) = &boot_tvec_bases;
/* Functions below help us manage 'deferrable' flag */
static inline unsigned int tbase_get_deferrable(tvec_base_t *base)
{
/* Functions below help us manage 'deferrable' flag */
static inline unsigned int tbase_get_deferrable(tvec_base_t *base)
{
- return (
(unsigned int)
(unsigned long)base & TBASE_DEFERRABLE_FLAG);
+ return (
unsigned int)(
(unsigned long)base & TBASE_DEFERRABLE_FLAG);
}
static inline tvec_base_t *tbase_get_base(tvec_base_t *base)
{
}
static inline tvec_base_t *tbase_get_base(tvec_base_t *base)
{
- return (
(tvec_base_t *)((unsigned long)base & ~TBASE_DEFERRABLE_FLAG)
);
+ return (
tvec_base_t *)((unsigned long)base & ~TBASE_DEFERRABLE_FLAG
);
}
static inline void timer_set_deferrable(struct timer_list *timer)
{
}
static inline void timer_set_deferrable(struct timer_list *timer)
{
- timer->base = (
(tvec_base_t *)((unsigned long)(timer->base)
|
- TBASE_DEFERRABLE_FLAG)
)
;
+ timer->base = (
tvec_base_t *)((unsigned long)timer->base
|
+ TBASE_DEFERRABLE_FLAG);
}
static inline void
timer_set_base(struct timer_list *timer, tvec_base_t *new_base)
{
}
static inline void
timer_set_base(struct timer_list *timer, tvec_base_t *new_base)
{
- timer->base = (tvec_base_t *)((unsigned long)
(new_base)
|
+ timer->base = (tvec_base_t *)((unsigned long)
new_base
|
tbase_get_deferrable(timer->base));
}
tbase_get_deferrable(timer->base));
}