Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 9e506f7adce8e6165a104d3d78fddd8ff0cdccf8

Authored by Akinobu Mita
Committed by Linus Torvalds
1 parent 94b3dd0f7b
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

kernel/: fix BUG_ON checks for cpu notifier callbacks direct call 

The commit 80b5184cc537718122e036afe7e62d202b70d077 ("kernel/: convert cpu
notifier to return encapsulate errno value") changed the return value of
cpu notifier callbacks.

Those callbacks don't return NOTIFY_BAD on failures anymore.  But there
are a few callbacks which are called directly at init time and checking
the return value.

I forgot to change BUG_ON checking by the direct callers in the commit.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -850,7 +850,7 @@
850 850 void *cpu = (void *)(long)smp_processor_id();
851 851 int err = cpu_callback(&cpu_nfb, CPU_UP_PREPARE, cpu);
852 852  
853   - BUG_ON(err == NOTIFY_BAD);
  853 + BUG_ON(err != NOTIFY_OK);
854 854 cpu_callback(&cpu_nfb, CPU_ONLINE, cpu);
855 855 register_cpu_notifier(&cpu_nfb);
856 856 return 0;
... ... @@ -1717,7 +1717,7 @@
1717 1717  
1718 1718 init_timer_stats();
1719 1719  
1720   - BUG_ON(err == NOTIFY_BAD);
  1720 + BUG_ON(err != NOTIFY_OK);
1721 1721 register_cpu_notifier(&timers_nb);
1722 1722 open_softirq(TIMER_SOFTIRQ, run_timer_softirq);
1723 1723 }