The patch titled fbcon: fix sparse warning about shadowing 'p' symbol has been removed from the -mm tree. Its filename was fbcon-fix-sparse-warning-about-shadowing-p-symbol.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: fbcon: fix sparse warning about shadowing 'p' symbol From: Marcin Slusarz <marcin.slusarz@xxxxxxxxx> Signed-off-by: Marcin Slusarz <marcin.slusarz@xxxxxxxxx> Cc: "Antonino A. Daplas" <adaplas@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/console/fbcon.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff -puN drivers/video/console/fbcon.c~fbcon-fix-sparse-warning-about-shadowing-p-symbol drivers/video/console/fbcon.c --- a/drivers/video/console/fbcon.c~fbcon-fix-sparse-warning-about-shadowing-p-symbol +++ a/drivers/video/console/fbcon.c @@ -2795,7 +2795,7 @@ static int fbcon_scrolldelta(struct vc_d { struct fb_info *info = registered_fb[con2fb_map[fg_console]]; struct fbcon_ops *ops = info->fbcon_par; - struct display *p = &fb_display[fg_console]; + struct display *disp = &fb_display[fg_console]; int offset, limit, scrollback_old; if (softback_top) { @@ -2833,7 +2833,7 @@ static int fbcon_scrolldelta(struct vc_d logo_shown = FBCON_LOGO_CANSHOW; } fbcon_cursor(vc, CM_ERASE | CM_SOFTBACK); - fbcon_redraw_softback(vc, p, lines); + fbcon_redraw_softback(vc, disp, lines); fbcon_cursor(vc, CM_DRAW | CM_SOFTBACK); return 0; } @@ -2855,9 +2855,9 @@ static int fbcon_scrolldelta(struct vc_d fbcon_cursor(vc, CM_ERASE); - offset = p->yscroll - scrollback_current; - limit = p->vrows; - switch (p->scrollmode) { + offset = disp->yscroll - scrollback_current; + limit = disp->vrows; + switch (disp->scrollmode) { case SCROLL_WRAP_MOVE: info->var.vmode |= FB_VMODE_YWRAP; break; _ Patches currently in -mm which might be from marcin.slusarz@xxxxxxxxx are origin.patch byteorder-move-le32_add_cpu-friends-from-ocfs2-to-core.patch ext3-replace-all-adds-to-little-endians-variables-with-le_add_cpu.patch xfs-convert-bex_add-to-bex_add_cpu-new-common-api.patch xfs-convert-bex_add-to-bex_add_cpu-new-common-api-fix.patch udf-fix-coding-style-of-superc.patch udf-remove-some-ugly-macros.patch udf-convert-udf_sb_alloc_partmaps-macro-to-udf_sb_alloc_partition_maps-function.patch udf-check-if-udf_load_logicalvol-failed.patch udf-convert-macros-related-to-bitmaps-to-functions.patch udf-move-calculating-of-nr_groups-into-helper-function.patch udf-fix-sparse-warnings-shadowing-mismatch-between-declaration-and-definition.patch udf-fix-coding-style.patch udf-create-common-function-for-tag-checksumming.patch udf-create-common-function-for-changing-free-space-counter.patch udf-replace-loops-coded-with-goto-to-real-loops.patch udf-convert-byte-order-of-constant-instead-of-variable.patch udf-remove-udf_i_-macros-and-open-code-them.patch udf-cache-struct-udf_inode_info.patch udf-fix-udf_debug-macro.patch udf-improve-readability-of-udf_load_partition.patch udf-remove-wrong-prototype-of-udf_readdir.patch udf-fix-3-signedness-1-unitialized-variable-warnings.patch udf-fix-signedness-issue.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