diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-12 17:52:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-12 17:52:13 -0400 |
commit | 983dfa4b6ee556563f7963348e4e2f97fc8a15b8 (patch) | |
tree | 394ca60456f251e0308cf55816407261b1bd39d2 /arch/um/include | |
parent | 47782361aca21a32ad4198f1b72f1655a7c9f7e5 (diff) | |
parent | 1987b1b8f9f17a06255877e7917d0bb5b5377774 (diff) | |
download | linux-stable-983dfa4b6ee556563f7963348e4e2f97fc8a15b8.tar.gz linux-stable-983dfa4b6ee556563f7963348e4e2f97fc8a15b8.tar.bz2 linux-stable-983dfa4b6ee556563f7963348e4e2f97fc8a15b8.zip |
Merge tag 'for-linus-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- Kconfig cleanups
- Fix cpu_all_mask() usage
- Various bug fixes
* tag 'for-linus-5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: irq: don't set the chip for all irqs
um: define set_pte_at() as a static inline function, not a macro
um: remove uses of variable length arrays
um: remove unused variable
uml: fix a boot splat wrt use of cpu_all_mask
um: Do not unlock mutex that is not hold.
hostfs: fix mismatch between link_file definition and declaration
arch: um: drivers: Kconfig: pedantic formatting
arch: um: Kconfig: pedantic indention cleanups
um: Revert to using stack for pt_regs in signal handling
Diffstat (limited to 'arch/um/include')
-rw-r--r-- | arch/um/include/asm/pgtable.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/um/include/asm/pgtable.h b/arch/um/include/asm/pgtable.h index 9c04562310b3..b377df76cc28 100644 --- a/arch/um/include/asm/pgtable.h +++ b/arch/um/include/asm/pgtable.h @@ -263,7 +263,12 @@ static inline void set_pte(pte_t *pteptr, pte_t pteval) *pteptr = pte_mknewpage(*pteptr); if(pte_present(*pteptr)) *pteptr = pte_mknewprot(*pteptr); } -#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval) + +static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, + pte_t *pteptr, pte_t pteval) +{ + set_pte(pteptr, pteval); +} #define __HAVE_ARCH_PTE_SAME static inline int pte_same(pte_t pte_a, pte_t pte_b) |