[Adeos-main] [PATCH] i386: forgotten hunk of domain violation patch

[Adeos-main] [PATCH] i386: forgotten hunk of domain violation patch

[Jan Kiszka]

[-- Attachment #1.1: Type: text/plain, Size: 93 bytes --]

x86_64 has it correctly, i386 is yet lacking it. Please apply for the
next release.

Jan

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: fix-context-checks.patch --]
[-- Type: text/x-patch; name="fix-context-checks.patch", Size: 765 bytes --]

Index: linux-2.6.20-ipipe/arch/i386/kernel/ipipe.c
===================================================================
--- linux-2.6.20-ipipe.orig/arch/i386/kernel/ipipe.c
+++ linux-2.6.20-ipipe/arch/i386/kernel/ipipe.c
@@ -680,8 +680,13 @@ fastcall int __ipipe_handle_exception(st
 	/* Track the hw interrupt state before calling the Linux
 	 * exception handler, replicating it into the virtual mask. */
 
-	if (irqs_disabled_hw())
-		local_irq_disable();
+	if (irqs_disabled_hw()) {
+		/* Do not trigger the alarm in ipipe_check_context() by using
+		 * plain local_irq_disable(). */
+		__ipipe_stall_root();
+		trace_hardirqs_off();
+		barrier();
+	}
 
 #ifdef CONFIG_KGDB
 	/* catch exception KGDB is interested in over non-root domains */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 249 bytes --]

Re: [Adeos-main] [PATCH] i386: forgotten hunk of domain violation patch

[Philippe Gerum]

On Fri, 2007-05-25 at 07:59 +0200, Jan Kiszka wrote:
> x86_64 has it correctly, i386 is yet lacking it. Please apply for the
> next release.
> 

Merged, thanks.

> Jan
-- 
Philippe.