Merge tag 'io_uring-5.15-2021-09-11' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / include / linux / highmem-internal.h

diff --git a/include/linux/highmem-internal.h b/include/linux/highmem-internal.h
index 7902c7d..4aa1031 100644 (file)
--- a/include/linux/highmem-internal.h
+++ b/include/linux/highmem-internal.h
@@ -90,7 +90,11 @@ static inline void __kunmap_local(void *vaddr)
 
 static inline void *kmap_atomic_prot(struct page *page, pgprot_t prot)
 {
-       preempt_disable();
+       if (IS_ENABLED(CONFIG_PREEMPT_RT))
+               migrate_disable();
+       else
+               preempt_disable();
+
        pagefault_disable();
        return __kmap_local_page_prot(page, prot);
 }
@@ -102,7 +106,11 @@ static inline void *kmap_atomic(struct page *page)
 
 static inline void *kmap_atomic_pfn(unsigned long pfn)
 {
-       preempt_disable();
+       if (IS_ENABLED(CONFIG_PREEMPT_RT))
+               migrate_disable();
+       else
+               preempt_disable();
+
        pagefault_disable();
        return __kmap_local_pfn_prot(pfn, kmap_prot);
 }
@@ -111,7 +119,10 @@ static inline void __kunmap_atomic(void *addr)
 {
        kunmap_local_indexed(addr);
        pagefault_enable();
-       preempt_enable();
+       if (IS_ENABLED(CONFIG_PREEMPT_RT))
+               migrate_enable();
+       else
+               preempt_enable();
 }
 
 unsigned int __nr_free_highpages(void);
@@ -179,7 +190,10 @@ static inline void __kunmap_local(void *addr)
 
 static inline void *kmap_atomic(struct page *page)
 {
-       preempt_disable();
+       if (IS_ENABLED(CONFIG_PREEMPT_RT))
+               migrate_disable();
+       else
+               preempt_disable();
        pagefault_disable();
        return page_address(page);
 }
@@ -200,7 +214,10 @@ static inline void __kunmap_atomic(void *addr)
        kunmap_flush_on_unmap(addr);
 #endif
        pagefault_enable();
-       preempt_enable();
+       if (IS_ENABLED(CONFIG_PREEMPT_RT))
+               migrate_enable();
+       else
+               preempt_enable();
 }
 
 static inline unsigned int nr_free_highpages(void) { return 0; }