Re: svn commit: r307213 - stable/10/sys/x86/x86

2016-10-13 Thread Sepherosa Ziehau 
On Thu, Oct 13, 2016 at 5:37 PM, Roger Pau Monné  wrote:
> Author: royger
> Date: Thu Oct 13 09:37:21 2016
> New Revision: 307213
> URL: https://svnweb.freebsd.org/changeset/base/307213
>
> Log:
>   MFC r303491:
>
>   Revert r291022: x86/intr: allow mutex recursion in intr_remove_handler
>
>   Sponsored by: Citrix Systems R

Thank you very much!
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r307213 - stable/10/sys/x86/x86

2016-10-13 Thread Roger Pau Monné 
Author: royger
Date: Thu Oct 13 09:37:21 2016
New Revision: 307213
URL: https://svnweb.freebsd.org/changeset/base/307213

Log:
  MFC r303491:
  
  Revert r291022: x86/intr: allow mutex recursion in intr_remove_handler
  
  Sponsored by: Citrix Systems R

Modified:
  stable/10/sys/x86/x86/intr_machdep.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/x86/x86/intr_machdep.c
==
--- stable/10/sys/x86/x86/intr_machdep.cThu Oct 13 09:27:08 2016
(r307212)
+++ stable/10/sys/x86/x86/intr_machdep.cThu Oct 13 09:37:21 2016
(r307213)
@@ -197,28 +197,19 @@ int
 intr_remove_handler(void *cookie)
 {
struct intsrc *isrc;
-   int error, mtx_owned;
+   int error;
 
isrc = intr_handler_source(cookie);
error = intr_event_remove_handler(cookie);
if (error == 0) {
-   /*
-* Recursion is needed here so PICs can remove interrupts
-* while resuming. It was previously not possible due to
-* intr_resume holding the intr_table_lock and
-* intr_remove_handler recursing on it.
-*/
-   mtx_owned = mtx_owned(_table_lock);
-   if (mtx_owned == 0)
-   mtx_lock(_table_lock);
+   mtx_lock(_table_lock);
isrc->is_handlers--;
if (isrc->is_handlers == 0) {
isrc->is_pic->pic_disable_source(isrc, PIC_NO_EOI);
isrc->is_pic->pic_disable_intr(isrc);
}
intrcnt_updatename(isrc);
-   if (mtx_owned == 0)
-   mtx_unlock(_table_lock);
+   mtx_unlock(_table_lock);
}
return (error);
 }
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"