|
52 | 52 | __local_unlock_irqrestore(lock, flags) |
53 | 53 |
|
54 | 54 | /** |
55 | | - * localtry_lock_init - Runtime initialize a lock instance |
56 | | - */ |
57 | | -#define localtry_lock_init(lock) __localtry_lock_init(lock) |
58 | | - |
59 | | -/** |
60 | | - * localtry_lock - Acquire a per CPU local lock |
61 | | - * @lock: The lock variable |
62 | | - */ |
63 | | -#define localtry_lock(lock) __localtry_lock(lock) |
64 | | - |
65 | | -/** |
66 | | - * localtry_lock_irq - Acquire a per CPU local lock and disable interrupts |
67 | | - * @lock: The lock variable |
68 | | - */ |
69 | | -#define localtry_lock_irq(lock) __localtry_lock_irq(lock) |
70 | | - |
71 | | -/** |
72 | | - * localtry_lock_irqsave - Acquire a per CPU local lock, save and disable |
73 | | - * interrupts |
74 | | - * @lock: The lock variable |
75 | | - * @flags: Storage for interrupt flags |
| 55 | + * local_lock_init - Runtime initialize a lock instance |
76 | 56 | */ |
77 | | -#define localtry_lock_irqsave(lock, flags) \ |
78 | | - __localtry_lock_irqsave(lock, flags) |
| 57 | +#define local_trylock_init(lock) __local_trylock_init(lock) |
79 | 58 |
|
80 | 59 | /** |
81 | | - * localtry_trylock - Try to acquire a per CPU local lock. |
| 60 | + * local_trylock - Try to acquire a per CPU local lock |
82 | 61 | * @lock: The lock variable |
83 | 62 | * |
84 | 63 | * The function can be used in any context such as NMI or HARDIRQ. Due to |
85 | 64 | * locking constrains it will _always_ fail to acquire the lock in NMI or |
86 | 65 | * HARDIRQ context on PREEMPT_RT. |
87 | 66 | */ |
88 | | -#define localtry_trylock(lock) __localtry_trylock(lock) |
| 67 | +#define local_trylock(lock) __local_trylock(lock) |
89 | 68 |
|
90 | 69 | /** |
91 | | - * localtry_trylock_irqsave - Try to acquire a per CPU local lock, save and disable |
92 | | - * interrupts if acquired |
| 70 | + * local_trylock_irqsave - Try to acquire a per CPU local lock, save and disable |
| 71 | + * interrupts if acquired |
93 | 72 | * @lock: The lock variable |
94 | 73 | * @flags: Storage for interrupt flags |
95 | 74 | * |
96 | 75 | * The function can be used in any context such as NMI or HARDIRQ. Due to |
97 | 76 | * locking constrains it will _always_ fail to acquire the lock in NMI or |
98 | 77 | * HARDIRQ context on PREEMPT_RT. |
99 | 78 | */ |
100 | | -#define localtry_trylock_irqsave(lock, flags) \ |
101 | | - __localtry_trylock_irqsave(lock, flags) |
102 | | - |
103 | | -/** |
104 | | - * local_unlock - Release a per CPU local lock |
105 | | - * @lock: The lock variable |
106 | | - */ |
107 | | -#define localtry_unlock(lock) __localtry_unlock(lock) |
108 | | - |
109 | | -/** |
110 | | - * local_unlock_irq - Release a per CPU local lock and enable interrupts |
111 | | - * @lock: The lock variable |
112 | | - */ |
113 | | -#define localtry_unlock_irq(lock) __localtry_unlock_irq(lock) |
114 | | - |
115 | | -/** |
116 | | - * localtry_unlock_irqrestore - Release a per CPU local lock and restore |
117 | | - * interrupt flags |
118 | | - * @lock: The lock variable |
119 | | - * @flags: Interrupt flags to restore |
120 | | - */ |
121 | | -#define localtry_unlock_irqrestore(lock, flags) \ |
122 | | - __localtry_unlock_irqrestore(lock, flags) |
| 79 | +#define local_trylock_irqsave(lock, flags) \ |
| 80 | + __local_trylock_irqsave(lock, flags) |
123 | 81 |
|
124 | 82 | DEFINE_GUARD(local_lock, local_lock_t __percpu*, |
125 | 83 | local_lock(_T), |
|
0 commit comments