diff for duplicates of <526DFDA8.7010806@cn.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index 0b91e41..74dc244 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,7 +7,7 @@ reworked locking to fix related lock ordering on takeover, and introduced consol 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] ------------------------------------------------------- @@ -116,7 +116,7 @@ index dacaf74..010d191 100644 - 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 ade2b33..755fac4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Gu Zheng <guz.fnst@cn.fujitsu.com>\0" "Subject\0[RFC PATCH RESEND] fb: reorder the lock sequence to fix a potential lockdep\0" - "Date\0Mon, 28 Oct 2013 06:01:12 +0000\0" + "Date\0Mon, 28 Oct 2013 14:01:12 +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>" @@ -16,7 +16,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" @@ -125,7 +125,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" @@ -204,4 +204,4 @@ "-- \n" 1.7.7 -efdade2a5eb746cdbb3247e688aadf280649b7857cdcb03e59d9cd24af8cc115 +6714602625a70555f5e2c2e6a45d0664df4147fbb2b9e2e5bf85333c8f776e69
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.