Discard/reconstruct list of offscreen areas on VT switch so no allocationsxfixes_2_branchpoint

    can occur while switched away.
Set type of off_screen_areas member to actual type instead of pointer

1 files changed, 2 insertions, 2 deletions

diff --git a/hw/kdrive/src/koffscreen.c b/hw/kdrive/src/koffscreen.c
index 1454c4a64..65c15a284 100644
--- a/hw/kdrive/src/koffscreen.c
+++ b/hw/kdrive/src/koffscreen.c
@@ -222,12 +222,13 @@ KdOffscreenSwapOut (ScreenPtr pScreen)
 	KdOffscreenValidate (pScreen);
     }    
     KdOffscreenValidate (pScreen);
+    KdOffscreenFini (pScreen);
 }
 
 void
 KdOffscreenSwapIn (ScreenPtr pScreen)
 {
-    /* nothing to do here; page in on usage */
+    KdOffscreenInit (pScreen);
 }
 
 /* merge the next free area into this one */
@@ -248,7 +249,6 @@ KdOffscreenMerge (KdOffscreenArea *area)
 void
 KdOffscreenFree (KdOffscreenArea *area)
 {
-    ScreenPtr		pScreen = area->screen;
     RealOffscreenArea	*real_area = (RealOffscreenArea *) area;
     RealOffscreenArea	*next = real_area->next;
     RealOffscreenArea	*prev = real_area->prev;