diff for duplicates of <1484069517.1301.4.camel@gmx.de> diff --git a/a/1.txt b/N1/1.txt index cf8a29f..11585d3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -161,7 +161,8 @@ Manuel > > > { > > > - if (vgacon_scrollback.data && reset_size > 0) > > > - memset(vgacon_scrollback.data, 0, reset_size); -> > > + struct vgacon_scrollback_info *scrollback > > > &vgacon_scrollbacks[vc_num]; +> > > + struct vgacon_scrollback_info *scrollback = +> > > &vgacon_scrollbacks[vc_num]; > > > + > > > + if (scrollback->data && reset_size > 0) > > > + memset(scrollback->data, 0, reset_size); @@ -214,7 +215,8 @@ Manuel > > > + vgacon_scrollback_init(vc_num); > > > + } else { > > > +#ifdef CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT -> > > + vgacon_scrollback_cur > > > &vgacon_scrollbacks[vc_num]; +> > > + vgacon_scrollback_cur = +> > > &vgacon_scrollbacks[vc_num]; > > > +#else > > > + size_t size = CONFIG_VGACON_SOFT_SCROLLBACK_SIZE > > > * 1024; @@ -226,7 +228,8 @@ Manuel > > > > > > static void vgacon_scrollback_startup(void) > > > { -> > > - vgacon_scrollback.data > > > kcalloc(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE, +> > > - vgacon_scrollback.data = +> > > kcalloc(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE, > > > - 1024, GFP_NOWAIT); > > > - vgacon_scrollback_init(vga_video_num_columns * 2); > > > + vgacon_scrollback_cur = &vgacon_scrollbacks[0]; @@ -259,20 +262,25 @@ Manuel > > > - vgacon_scrollback.tail += c->vc_size_row; > > > + vgacon_scrollback_cur->tail += c->vc_size_row; > > > -> > > - if (vgacon_scrollback.tail >> > > vgacon_scrollback.size) +> > > - if (vgacon_scrollback.tail >= +> > > vgacon_scrollback.size) > > > - vgacon_scrollback.tail = 0; -> > > + if (vgacon_scrollback_cur->tail >> > > vgacon_scrollback_cur->size) +> > > + if (vgacon_scrollback_cur->tail >= +> > > vgacon_scrollback_cur->size) > > > + vgacon_scrollback_cur->tail = 0; > > > > > > - if (vgacon_scrollback.cnt > > > > vgacon_scrollback.rows) -> > > - vgacon_scrollback.cnt > > > vgacon_scrollback.rows; +> > > - vgacon_scrollback.cnt = +> > > vgacon_scrollback.rows; > > > + if (vgacon_scrollback_cur->cnt > > > > vgacon_scrollback_cur->rows) -> > > + vgacon_scrollback_cur->cnt > > > vgacon_scrollback_cur->rows; +> > > + vgacon_scrollback_cur->cnt = +> > > vgacon_scrollback_cur->rows; > > > > > > - vgacon_scrollback.cur = vgacon_scrollback.cnt; -> > > + vgacon_scrollback_cur->cur > > > vgacon_scrollback_cur->cnt; +> > > + vgacon_scrollback_cur->cur = +> > > vgacon_scrollback_cur->cnt; > > > } > > > } > > > @@ -292,7 +300,8 @@ Manuel > > > - vgacon_scrollback.restore = 1; > > > - vgacon_scrollback.cur = vgacon_scrollback.cnt; > > > + vgacon_scrollback_cur->restore = 1; -> > > + vgacon_scrollback_cur->cur > > > vgacon_scrollback_cur->cnt; +> > > + vgacon_scrollback_cur->cur = +> > > vgacon_scrollback_cur->cnt; > > > } > > > } > > > @@ -384,7 +393,7 @@ Manuel > > > { > > > size_t size = CONFIG_VGACON_SOFT_SCROLLBACK_SIZE * 1024; > > > -> > > - if (c->vc_num = fg_console) +> > > - if (c->vc_num == fg_console) > > > - vgacon_scrollback_reset(size); > > > + vgacon_scrollback_reset(c->vc_num, size); > > > } diff --git a/a/content_digest b/N1/content_digest index 9787004..14116ec 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,7 +5,7 @@ "ref\04640722.jsFVORW8WM@amdc3058\0" "From\0Manuel Sch\303\266lling <manuel.schoelling@gmx.de>\0" "Subject\0Re: [PATCH v8 3/3] console: Add persistent scrollback buffers for all VGA consoles\0" - "Date\0Tue, 10 Jan 2017 17:31:57 +0000\0" + "Date\0Tue, 10 Jan 2017 18:31:57 +0100\0" "To\0Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>\0" "Cc\0gregkh@linuxfoundation.org" jslaby@suse.com @@ -186,7 +186,8 @@ "> > > \302\240{\n" "> > > -\tif (vgacon_scrollback.data && reset_size > 0)\n" "> > > -\t\tmemset(vgacon_scrollback.data, 0, reset_size);\n" - "> > > +\tstruct vgacon_scrollback_info *scrollback > > > &vgacon_scrollbacks[vc_num];\n" + "> > > +\tstruct vgacon_scrollback_info *scrollback =\n" + "> > > &vgacon_scrollbacks[vc_num];\n" "> > > +\n" "> > > +\tif (scrollback->data && reset_size > 0)\n" "> > > +\t\tmemset(scrollback->data, 0, reset_size);\n" @@ -239,7 +240,8 @@ "> > > +\t\tvgacon_scrollback_init(vc_num);\n" "> > > +\t} else {\n" "> > > +#ifdef CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT\n" - "> > > +\t\tvgacon_scrollback_cur > > > &vgacon_scrollbacks[vc_num];\n" + "> > > +\t\tvgacon_scrollback_cur =\n" + "> > > &vgacon_scrollbacks[vc_num];\n" "> > > +#else\n" "> > > +\t\tsize_t size = CONFIG_VGACON_SOFT_SCROLLBACK_SIZE\n" "> > > * 1024;\n" @@ -251,7 +253,8 @@ "> > > \302\240\n" "> > > \302\240static void vgacon_scrollback_startup(void)\n" "> > > \302\240{\n" - "> > > -\tvgacon_scrollback.data > > > kcalloc(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE,\n" + "> > > -\tvgacon_scrollback.data =\n" + "> > > kcalloc(CONFIG_VGACON_SOFT_SCROLLBACK_SIZE,\n" "> > > -\t\t1024, GFP_NOWAIT);\n" "> > > -\tvgacon_scrollback_init(vga_video_num_columns * 2);\n" "> > > +\tvgacon_scrollback_cur = &vgacon_scrollbacks[0];\n" @@ -284,20 +287,25 @@ "> > > -\t\tvgacon_scrollback.tail += c->vc_size_row;\n" "> > > +\t\tvgacon_scrollback_cur->tail += c->vc_size_row;\n" "> > > \302\240\n" - "> > > -\t\tif (vgacon_scrollback.tail >> > > vgacon_scrollback.size)\n" + "> > > -\t\tif (vgacon_scrollback.tail >=\n" + "> > > vgacon_scrollback.size)\n" "> > > -\t\t\tvgacon_scrollback.tail = 0;\n" - "> > > +\t\tif (vgacon_scrollback_cur->tail >> > > vgacon_scrollback_cur->size)\n" + "> > > +\t\tif (vgacon_scrollback_cur->tail >=\n" + "> > > vgacon_scrollback_cur->size)\n" "> > > +\t\t\tvgacon_scrollback_cur->tail = 0;\n" "> > > \302\240\n" "> > > -\t\tif (vgacon_scrollback.cnt >\n" "> > > vgacon_scrollback.rows)\n" - "> > > -\t\t\tvgacon_scrollback.cnt > > > vgacon_scrollback.rows;\n" + "> > > -\t\t\tvgacon_scrollback.cnt =\n" + "> > > vgacon_scrollback.rows;\n" "> > > +\t\tif (vgacon_scrollback_cur->cnt >\n" "> > > vgacon_scrollback_cur->rows)\n" - "> > > +\t\t\tvgacon_scrollback_cur->cnt > > > vgacon_scrollback_cur->rows;\n" + "> > > +\t\t\tvgacon_scrollback_cur->cnt =\n" + "> > > vgacon_scrollback_cur->rows;\n" "> > > \302\240\n" "> > > -\t\tvgacon_scrollback.cur = vgacon_scrollback.cnt;\n" - "> > > +\t\tvgacon_scrollback_cur->cur > > > vgacon_scrollback_cur->cnt;\n" + "> > > +\t\tvgacon_scrollback_cur->cur =\n" + "> > > vgacon_scrollback_cur->cnt;\n" "> > > \302\240\t}\n" "> > > \302\240}\n" "> > > \302\240\n" @@ -317,7 +325,8 @@ "> > > -\t\tvgacon_scrollback.restore = 1;\n" "> > > -\t\tvgacon_scrollback.cur = vgacon_scrollback.cnt;\n" "> > > +\t\tvgacon_scrollback_cur->restore = 1;\n" - "> > > +\t\tvgacon_scrollback_cur->cur > > > vgacon_scrollback_cur->cnt;\n" + "> > > +\t\tvgacon_scrollback_cur->cur =\n" + "> > > vgacon_scrollback_cur->cnt;\n" "> > > \302\240\t}\n" "> > > \302\240}\n" "> > > \302\240\n" @@ -409,7 +418,7 @@ "> > > \302\240{\n" "> > > \302\240\tsize_t size = CONFIG_VGACON_SOFT_SCROLLBACK_SIZE * 1024;\n" "> > > \302\240\n" - "> > > -\tif (c->vc_num = fg_console)\n" + "> > > -\tif (c->vc_num == fg_console)\n" "> > > -\t\tvgacon_scrollback_reset(size);\n" "> > > +\tvgacon_scrollback_reset(c->vc_num, size);\n" "> > > \302\240}\n" @@ -433,4 +442,4 @@ "> \n" > -d5d218705f777467af2591549d11c8acd56b7d08826733ee0e162ac3538b0527 +594d4c22cd5adce72572dec42441894f384f3e93d2d1516d9cf6dad5ecd8c827
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.