diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-04 18:15:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-04 18:15:10 -0700 |
| commit | d665ea6ea86c785760ee4bad4543dab3267ad074 (patch) | |
| tree | a1b058e5705784a7408afccfc2a6deef1da93c3c /arch/um/include/asm/pgtable.h | |
| parent | 51f629446cd172e324deb0146741888cac5dedca (diff) | |
| parent | ed102bf2afed226703eaf85a704755bdbea34583 (diff) | |
| download | linux-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/include/asm/pgtable.h')
| -rw-r--r-- | arch/um/include/asm/pgtable.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/asm/pgtable.h b/arch/um/include/asm/pgtable.h index def376194dce..b9e20bbe2f75 100644 --- a/arch/um/include/asm/pgtable.h +++ b/arch/um/include/asm/pgtable.h @@ -302,7 +302,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) struct mm_struct; extern pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr); -#define update_mmu_cache(vma,address,ptep) do ; while (0) +#define update_mmu_cache(vma,address,ptep) do {} while (0) /* Encode and de-code a swap entry */ #define __swp_type(x) (((x).val >> 5) & 0x1f) |