Merge tag 'v5.18-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-microblaze.git] / include / linux / fb.h

diff --git a/include/linux/fb.h b/include/linux/fb.h
index 02f362c..9a77ab6 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -204,6 +204,7 @@ struct fb_pixmap {
 struct fb_deferred_io {
        /* delay between mkwrite and deferred handler */
        unsigned long delay;
+       bool sort_pagelist; /* sort pagelist by offset */
        struct mutex lock; /* mutex that protects the page list */
        struct list_head pagelist; /* list of touched pages */
        /* callback */
@@ -502,6 +503,7 @@ struct fb_info {
        } *apertures;
 
        bool skip_vt_switch; /* no VT switch on suspend/resume required */
+       bool forced_out; /* set when being removed by another driver */
 };
 
 static inline struct apertures_struct *alloc_apertures(unsigned int max_num) {