mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-18 03:23:53 -04:00
genirq, softirq: Use in_hardirq() instead of in_irq()
Replace the obsolete and ambiguos macro in_irq() with the new macro in_hardirq(). Signed-off-by: Changbin Du <changbin.du@gmail.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20220128110727.5110-1-changbin.du@gmail.com
This commit is contained in:
committed by
Thomas Gleixner
parent
26291c54e1
commit
fe13889c39
@@ -222,7 +222,7 @@ void __local_bh_enable_ip(unsigned long ip, unsigned int cnt)
|
||||
u32 pending;
|
||||
int curcnt;
|
||||
|
||||
WARN_ON_ONCE(in_irq());
|
||||
WARN_ON_ONCE(in_hardirq());
|
||||
lockdep_assert_irqs_enabled();
|
||||
|
||||
local_irq_save(flags);
|
||||
@@ -305,7 +305,7 @@ void __local_bh_disable_ip(unsigned long ip, unsigned int cnt)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
WARN_ON_ONCE(in_irq());
|
||||
WARN_ON_ONCE(in_hardirq());
|
||||
|
||||
raw_local_irq_save(flags);
|
||||
/*
|
||||
@@ -352,14 +352,14 @@ static void __local_bh_enable(unsigned int cnt)
|
||||
*/
|
||||
void _local_bh_enable(void)
|
||||
{
|
||||
WARN_ON_ONCE(in_irq());
|
||||
WARN_ON_ONCE(in_hardirq());
|
||||
__local_bh_enable(SOFTIRQ_DISABLE_OFFSET);
|
||||
}
|
||||
EXPORT_SYMBOL(_local_bh_enable);
|
||||
|
||||
void __local_bh_enable_ip(unsigned long ip, unsigned int cnt)
|
||||
{
|
||||
WARN_ON_ONCE(in_irq());
|
||||
WARN_ON_ONCE(in_hardirq());
|
||||
lockdep_assert_irqs_enabled();
|
||||
#ifdef CONFIG_TRACE_IRQFLAGS
|
||||
local_irq_disable();
|
||||
@@ -618,7 +618,7 @@ static inline void tick_irq_exit(void)
|
||||
|
||||
/* Make sure that timer wheel updates are propagated */
|
||||
if ((idle_cpu(cpu) && !need_resched()) || tick_nohz_full_cpu(cpu)) {
|
||||
if (!in_irq())
|
||||
if (!in_hardirq())
|
||||
tick_nohz_irq_exit();
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user