fbdev/hyperv_fb: Do not clear global screen_info

Do not clear the global instance of screen_info. If necessary, clearing
fields in screen_info should be done by architecture or firmware code
that maintains the firmware framebuffer.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
index 09b18a8cddeed6310727ac7b06d2c7c94f879d5f..c26ee6fd73c9bb0cff77793e2af4ca5407c59aa1 100644 (file)
--- a/drivers/video/fbdev/hyperv_fb.c
+++ b/drivers/video/fbdev/hyperv_fb.c
@@ -48,7 +48,6 @@
 #include <linux/aperture.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/screen_info.h>
 #include <linux/vmalloc.h>
 #include <linux/init.h>
 #include <linux/completion.h>
@@ -1059,14 +1058,8 @@ getmem_done:
        else
                aperture_remove_all_conflicting_devices(KBUILD_MODNAME);
 
-       if (!gen2vm) {
+       if (!gen2vm)
                pci_dev_put(pdev);
-       } else if (IS_ENABLED(CONFIG_SYSFB)) {
-               /* framebuffer is reallocated, clear screen_info to avoid misuse from kexec */
-               screen_info.lfb_size = 0;
-               screen_info.lfb_base = 0;
-               screen_info.orig_video_isVGA = 0;
-       }
 
        return 0;