diff for duplicates of <52707A97.5080203@cn.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 77b63ec..aff9350 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,7 @@ On 10/28/2013 02:01 PM, Gu Zheng wrote: > into fbmem, but it seems that the new lock sequence(fb_info->lock ---> console_lock) > is against with the one in console_callback(console_lock ---> fb_info->lock), and leads to > a potential deadlock as following: -> [ 601.079000] =========================== +> [ 601.079000] ====================================================== > [ 601.079000] [ INFO: possible circular locking dependency detected ] > [ 601.079000] 3.11.0 #189 Not tainted > [ 601.079000] ------------------------------------------------------- @@ -125,7 +125,7 @@ On 10/28/2013 02:01 PM, Gu Zheng wrote: > - console_unlock(); > unlock_fb_info(info); > + console_unlock(); -> if (ret = 0 && copy_to_user(argp, &var, sizeof(var))) +> if (ret == 0 && copy_to_user(argp, &var, sizeof(var))) > return -EFAULT; > break; > @@ -1184,23 +1188,27 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, diff --git a/a/content_digest b/N1/content_digest index 7bee2f8..277851a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0526DFDA8.7010806@cn.fujitsu.com\0" "From\0Gu Zheng <guz.fnst@cn.fujitsu.com>\0" "Subject\0Re: [RFC PATCH RESEND] fb: reorder the lock sequence to fix a potential lockdep\0" - "Date\0Wed, 30 Oct 2013 03:18:47 +0000\0" + "Date\0Wed, 30 Oct 2013 11:18:47 +0800\0" "To\0Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>" " Tomi Valkeinen <tomi.valkeinen@ti.com>\0" "Cc\0Linux Fbdev development list <linux-fbdev@vger.kernel.org>" @@ -27,7 +27,7 @@ "> into fbmem, but it seems that the new lock sequence(fb_info->lock ---> console_lock)\n" "> is against with the one in console_callback(console_lock ---> fb_info->lock), and leads to\n" "> a potential deadlock as following:\n" - "> [ 601.079000] ===========================\n" + "> [ 601.079000] ======================================================\n" "> [ 601.079000] [ INFO: possible circular locking dependency detected ]\n" "> [ 601.079000] 3.11.0 #189 Not tainted\n" "> [ 601.079000] -------------------------------------------------------\n" @@ -136,7 +136,7 @@ "> -\t\tconsole_unlock();\n" "> \t\tunlock_fb_info(info);\n" "> +\t\tconsole_unlock();\n" - "> \t\tif (ret = 0 && copy_to_user(argp, &var, sizeof(var)))\n" + "> \t\tif (ret == 0 && copy_to_user(argp, &var, sizeof(var)))\n" "> \t\t\treturn -EFAULT;\n" "> \t\tbreak;\n" "> @@ -1184,23 +1188,27 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,\n" @@ -213,4 +213,4 @@ "> \tif (ret)\n" "> \t\treturn -EINVAL;" -030ccc86a5adaa0cf83c874cc05f1d03491708a5ddda4bee1a809be89cba6ed9 +836da9194300f12168e51365c3c571007ff638b1152d22b92aadd1caac9db129
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.