diff options
| author |   Tony Lindgren <tony@atomide.com> | 2015-09-14 13:42:11 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-09-14 13:42:11 -0700 |
| commit | 7168e947291f0ead07e5638b4599fb7845288b69 (patch) | |
| tree | b39cdf02f6d2282eeb91696d4a1c7ddb6afb0e38 /kernel/livepatch | |
| parent | ARM: omap2plus_defconfig: Enable MUSB DMA support (diff) | |
| parent | ARM: dts: Fixup model name for HP t410 dts (diff) | |
Merge branch 'fixes-rc1' into omap-for-v4.3/fixes
Diffstat (limited to 'kernel/livepatch')
| -rw-r--r-- | kernel/livepatch/core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index c40ebcca0495..6e5344112419 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -348,8 +348,10 @@ static void klp_disable_func(struct klp_func *func) { struct klp_ops *ops; - WARN_ON(func->state != KLP_ENABLED); - WARN_ON(!func->old_addr); + if (WARN_ON(func->state != KLP_ENABLED)) + return; + if (WARN_ON(!func->old_addr)) + return; ops = klp_find_ops(func->old_addr); if (WARN_ON(!ops)) |