1 files changed, 13 insertions, 4 deletions

diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 5855d17d19ac..9d8feac67637 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -42,6 +42,7 @@
 #include <linux/kd.h>
 #include <linux/slab.h>
 #include <linux/vt_kern.h>
+#include <linux/sched.h>
 #include <linux/selection.h>
 #include <linux/spinlock.h>
 #include <linux/ioport.h>
@@ -1124,11 +1125,15 @@ static int vgacon_do_font_op(struct vgastate *state,char *arg,int set,int ch512)
 
         if (arg) {
                 if (set)
-                        for (i = 0; i < cmapsz; i++)
+                        for (i = 0; i < cmapsz; i++) {
                                 vga_writeb(arg[i], charmap + i);
+                                cond_resched();
+                        }
                 else
-                        for (i = 0; i < cmapsz; i++)
+                        for (i = 0; i < cmapsz; i++) {
                                 arg[i] = vga_readb(charmap + i);
+                                cond_resched();
+                        }
 
                 /*
                  * In 512-character mode, the character map is not contiguous if
@@ -1139,11 +1144,15 @@ static int vgacon_do_font_op(struct vgastate *state,char *arg,int set,int ch512)
                         charmap += 2 * cmapsz;
                         arg += cmapsz;
                         if (set)
-                                for (i = 0; i < cmapsz; i++)
+                                for (i = 0; i < cmapsz; i++) {
                                         vga_writeb(arg[i], charmap + i);
+                                        cond_resched();
+                                }
                         else
-                                for (i = 0; i < cmapsz; i++)
+                                for (i = 0; i < cmapsz; i++) {
                                         arg[i] = vga_readb(charmap + i);
+                                        cond_resched();
+                                }
                 }
         }