patch-2.4.0-test5 linux/drivers/char/console.c

• Lines: 48
• Date: Tue Jul 18 15:57:28 2000
• Orig file: v2.4.0-test4/linux/drivers/char/console.c
• Orig date: Mon Jul 10 16:47:22 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/char/console.c linux/drivers/char/console.c
@@ -659,7 +659,7 @@
 		con_set_default_unimap(currcons);
 	    q = (long)kmalloc(screenbuf_size, GFP_KERNEL);
 	    if (!q) {
-		kfree_s((char *) p, structsize);
+		kfree((char *) p);
 		vc_cons[currcons].d = NULL;
 		vt_cons[currcons] = NULL;
 		return -ENOMEM;
@@ -703,7 +703,7 @@
 			if (!p) {
 				for (i = first; i < currcons; i++)
 					if (newscreens[i])
-						kfree_s(newscreens[i], ss);
+						kfree(newscreens[i]);
 				return -ENOMEM;
 			}
 			newscreens[currcons] = p;
@@ -749,7 +749,7 @@
 		if (nlend > nl)
 			scr_memsetw((void *) nl, video_erase_char, nlend - nl);
 		if (kmalloced)
-			kfree_s(screenbuf, oss);
+			kfree(screenbuf);
 		screenbuf = newscreens[currcons];
 		kmalloced = 1;
 		screenbuf_size = ss;
@@ -785,9 +785,9 @@
 	if (vc_cons_allocated(currcons)) {
 	    sw->con_deinit(vc_cons[currcons].d);
 	    if (kmalloced)
-		kfree_s(screenbuf, screenbuf_size);
+		kfree(screenbuf);
 	    if (currcons >= MIN_NR_CONSOLES)
-		kfree_s(vc_cons[currcons].d, structsize);
+		kfree(vc_cons[currcons].d);
 	    vc_cons[currcons].d = NULL;
 	}
 }
@@ -2860,7 +2860,7 @@
 			rc = -EFAULT;
 	}
 quit:	if (temp)
-		kfree_s(temp, size);
+		kfree(temp);
 	return rc;
 }