The patch titled
vgacon: vgacon_scrolldelta simplification
has been removed from the -mm tree. Its filename was
vgacon-vgacon_scrolldelta-simplification.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: vgacon: vgacon_scrolldelta simplification
From: Marcin Slusarz <marcin.slusarz@xxxxxxxxx>
There's no point in checking diff == c->vc_rows, because it can be true
only when count == 0, but we already checked that. Additionally move
variables used only in one block to this block.
Signed-off-by: Marcin Slusarz <marcin.slusarz@xxxxxxxxx>
Cc: Antonino Daplas <adaplas@xxxxxxxxx>
Acked-by: Krzysztof Helt <krzysztof.h1@xxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/console/vgacon.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff -puN drivers/video/console/vgacon.c~vgacon-vgacon_scrolldelta-simplification drivers/video/console/vgacon.c
--- a/drivers/video/console/vgacon.c~vgacon-vgacon_scrolldelta-simplification
+++ a/drivers/video/console/vgacon.c
@@ -239,8 +239,7 @@ static void vgacon_restore_screen(struct
static int vgacon_scrolldelta(struct vc_data *c, int lines)
{
- int start, end, count, soff, diff;
- void *d, *s;
+ int start, end, count, soff;
if (!lines) {
c->vc_visible_origin = c->vc_origin;
@@ -287,13 +286,13 @@ static int vgacon_scrolldelta(struct vc_
if (count > c->vc_rows)
count = c->vc_rows;
- diff = c->vc_rows - count;
-
- d = (void *) c->vc_origin;
- s = (void *) c->vc_screenbuf;
-
if (count) {
int copysize;
+
+ int diff = c->vc_rows - count;
+ void *d = (void *) c->vc_origin;
+ void *s = (void *) c->vc_screenbuf;
+
count *= c->vc_size_row;
/* how much memory to end of buffer left? */
copysize = min(count, vgacon_scrollback_size - soff);
@@ -305,14 +304,11 @@ static int vgacon_scrolldelta(struct vc_
scr_memcpyw(d, vgacon_scrollback, count);
d += count;
}
- }
- if (diff == c->vc_rows) {
- vgacon_cursor(c, CM_MOVE);
- } else {
if (diff)
scr_memcpyw(d, s, diff * c->vc_size_row);
- }
+ } else
+ vgacon_cursor(c, CM_MOVE);
return 1;
}
_
Patches currently in -mm which might be from marcin.slusarz@xxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
