summaryrefslogtreecommitdiffstats
path: root/arch/um/kernel/mem.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-05-04 18:15:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2021-05-04 18:15:10 -0700
commitd665ea6ea86c785760ee4bad4543dab3267ad074 (patch)
treea1b058e5705784a7408afccfc2a6deef1da93c3c /arch/um/kernel/mem.c
parent51f629446cd172e324deb0146741888cac5dedca (diff)
parented102bf2afed226703eaf85a704755bdbea34583 (diff)
downloadlinux-stable-d665ea6ea86c785760ee4bad4543dab3267ad074.tar.gz
linux-stable-d665ea6ea86c785760ee4bad4543dab3267ad074.tar.bz2
linux-stable-d665ea6ea86c785760ee4bad4543dab3267ad074.zip
Merge tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger: - Disable CONFIG_GCOV when built with modules - Many fixes for W=1 related warnings - Code cleanup * tag 'for-linus-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: um: Fix W=1 missing-include-dirs warnings um: elf.h: Fix W=1 warning for empty body in 'do' statement um: pgtable.h: Fix W=1 warning for empty body in 'do' statement um: Remove unused including <linux/version.h> um: Add 2 missing libs to fix various build errors um: Replace if (cond) BUG() with BUG_ON() um: Disable CONFIG_GCOV with MODULES um: Remove unneeded variable 'ret' um: Mark all kernel symbols as local um: Fix tag order in stub_32.h
Diffstat (limited to 'arch/um/kernel/mem.c')
-rw-r--r--arch/um/kernel/mem.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 9019ff5905b1..8e636ce02949 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -72,8 +72,7 @@ static void __init one_page_table_init(pmd_t *pmd)
set_pmd(pmd, __pmd(_KERNPG_TABLE +
(unsigned long) __pa(pte)));
- if (pte != pte_offset_kernel(pmd, 0))
- BUG();
+ BUG_ON(pte != pte_offset_kernel(pmd, 0));
}
}