aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2012-05-14 16:51:05 -0400
committerGlenn Elliott <gelliott@cs.unc.edu>2013-05-19 22:46:49 -0400
commit44326648c2ea81b9a32619644fe9c665ed0d9e0b (patch)
treeff1e00cf3cbc0e06f511a90c4f28aa8f7b40b12e /include/linux
parentaf6eeb156c7da47ff5df03a3da04432c8ac4460c (diff)
Final GPUSync implementation.gpusync-rtss12
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/interrupt.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 57a7bc8807be..8fb3dad55f19 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -528,7 +528,7 @@ static inline int tasklet_trylock(struct tasklet_struct *t)
528 528
529static inline void tasklet_unlock(struct tasklet_struct *t) 529static inline void tasklet_unlock(struct tasklet_struct *t)
530{ 530{
531 smp_mb__before_clear_bit(); 531 smp_mb__before_clear_bit();
532 clear_bit(TASKLET_STATE_RUN, &(t)->state); 532 clear_bit(TASKLET_STATE_RUN, &(t)->state);
533} 533}
534 534
@@ -590,7 +590,7 @@ static inline void tasklet_disable(struct tasklet_struct *t)
590} 590}
591 591
592static inline void tasklet_enable(struct tasklet_struct *t) 592static inline void tasklet_enable(struct tasklet_struct *t)
593{ 593{
594 smp_mb__before_atomic_dec(); 594 smp_mb__before_atomic_dec();
595 atomic_dec(&t->count); 595 atomic_dec(&t->count);
596} 596}
@@ -659,7 +659,7 @@ void tasklet_hrtimer_cancel(struct tasklet_hrtimer *ttimer)
659 * if more than one irq occurred. 659 * if more than one irq occurred.
660 */ 660 */
661 661
662#if defined(CONFIG_GENERIC_HARDIRQS) && !defined(CONFIG_GENERIC_IRQ_PROBE) 662#if defined(CONFIG_GENERIC_HARDIRQS) && !defined(CONFIG_GENERIC_IRQ_PROBE)
663static inline unsigned long probe_irq_on(void) 663static inline unsigned long probe_irq_on(void)
664{ 664{
665 return 0; 665 return 0;