diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-01-29 11:39:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-01-29 11:39:20 -0800 |
| commit | b2091a64820f068dd19b7dd5351d8095adb3e5f6 (patch) | |
| tree | e5ee0df43485e9c0b7719f30278e9577e3525230 /arch | |
| parent | 9071080d1e7af1a3a1699c3ba065c3293b5d09ce (diff) | |
| parent | bda50f7770e5b8e730745e119eb6ca78570f7abf (diff) | |
| download | linux-b2091a64820f068dd19b7dd5351d8095adb3e5f6.tar.gz linux-b2091a64820f068dd19b7dd5351d8095adb3e5f6.tar.bz2 linux-b2091a64820f068dd19b7dd5351d8095adb3e5f6.zip | |
Merge tag 'for-linus-6.14-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen updates from Juergen Gross:
"Three minor fixes"
* tag 'for-linus-6.14-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen: update pvcalls_front_accept prototype
Grab mm lock before grabbing pt lock
xen: pcpu: remove unnecessary __ref annotation
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/xen/mmu_pv.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index 55a4996d0c04..2c70cd35e72c 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -781,6 +781,7 @@ void xen_mm_pin_all(void) { struct page *page; + spin_lock(&init_mm.page_table_lock); spin_lock(&pgd_lock); list_for_each_entry(page, &pgd_list, lru) { @@ -791,6 +792,7 @@ void xen_mm_pin_all(void) } spin_unlock(&pgd_lock); + spin_unlock(&init_mm.page_table_lock); } static void __init xen_mark_pinned(struct mm_struct *mm, struct page *page, @@ -887,6 +889,7 @@ void xen_mm_unpin_all(void) { struct page *page; + spin_lock(&init_mm.page_table_lock); spin_lock(&pgd_lock); list_for_each_entry(page, &pgd_list, lru) { @@ -898,6 +901,7 @@ void xen_mm_unpin_all(void) } spin_unlock(&pgd_lock); + spin_unlock(&init_mm.page_table_lock); } static void xen_enter_mmap(struct mm_struct *mm) |