Index: /trunk/src/VBox/Runtime/Makefile.kmk =================================================================== --- /trunk/src/VBox/Runtime/Makefile.kmk (revision 19936) +++ /trunk/src/VBox/Runtime/Makefile.kmk (revision 19937) @@ -1122,6 +1122,4 @@ r0drv/linux/process-r0drv-linux.c \ r0drv/linux/RTLogWriteDebugger-r0drv-linux.c \ - r0drv/linux/RTThreadPreemptDisable-r0drv-linux.c \ - r0drv/linux/RTThreadPreemptRestore-r0drv-linux.c \ r0drv/linux/semevent-r0drv-linux.c \ r0drv/linux/semeventmulti-r0drv-linux.c \ Index: unk/src/VBox/Runtime/r0drv/linux/RTThreadPreemptDisable-r0drv-linux.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/linux/RTThreadPreemptDisable-r0drv-linux.c (revision 19936) +++ (revision ) @@ -1,53 +1,0 @@ -/* $Id$ */ -/** @file - * IPRT - RTThreadPreemptDisable, Generic ring-0 driver implementation. - */ - -/* - * Copyright (C) 2009 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * The contents of this file may alternatively be used under the terms - * of the Common Development and Distribution License Version 1.0 - * (CDDL) only, as it comes in the "COPYING.CDDL" file of the - * VirtualBox OSE distribution, in which case the provisions of the - * CDDL are applicable instead of those of the GPL. - * - * You may elect to license modified versions of this file under the - * terms and conditions of either the GPL or the CDDL or both. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - -/******************************************************************************* -* Header Files * -*******************************************************************************/ -#include "the-linux-kernel.h" - -#include -#include - - -RTDECL(void) RTThreadPreemptDisable(PRTTHREADPREEMPTSTATE pState) -{ - AssertPtr(pState); - Assert(pState->uchDummy != 42); - pState->uchDummy = 42; - - /* - * Note: This call is a NOP if CONFIG_PREEMPT is not enabled in the Linux kernel - * configuration. In that case, schedule() is only called need_resched() is set - * which is tested just before we return to R3 (not when returning from R0 to R0). - */ - preempt_disable(); -} - Index: unk/src/VBox/Runtime/r0drv/linux/RTThreadPreemptRestore-r0drv-linux.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/linux/RTThreadPreemptRestore-r0drv-linux.c (revision 19936) +++ (revision ) @@ -1,48 +1,0 @@ -/* $Id$ */ -/** @file - * IPRT - RTThreadPreemptRestore, Generic ring-0 driver implementation. - */ - -/* - * Copyright (C) 2009 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * The contents of this file may alternatively be used under the terms - * of the Common Development and Distribution License Version 1.0 - * (CDDL) only, as it comes in the "COPYING.CDDL" file of the - * VirtualBox OSE distribution, in which case the provisions of the - * CDDL are applicable instead of those of the GPL. - * - * You may elect to license modified versions of this file under the - * terms and conditions of either the GPL or the CDDL or both. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - -/******************************************************************************* -* Header Files * -*******************************************************************************/ -#include "the-linux-kernel.h" - -#include -#include - - -RTDECL(void) RTThreadPreemptRestore(PRTTHREADPREEMPTSTATE pState) -{ - AssertPtr(pState); - Assert(pState->uchDummy == 42); - pState->uchDummy = 0; - - preempt_enable(); -} - Index: /trunk/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c (revision 19936) +++ /trunk/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c (revision 19937) @@ -36,4 +36,5 @@ #include #include +#include @@ -67,2 +68,52 @@ } + +RTDECL(bool) RTThreadPreemptIsEnabled(RTTHREAD hThread) +{ + Assert(hThread == NIL_RTTHREAD); + return !in_atomic() && !irqs_disabled(); +} + + +RTDECL(bool) RTThreadPreemptIsPending(RTTHREAD hThread) +{ + Assert(hThread == NIL_RTTHREAD); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 4) + return test_tsk_thread_flag(current, TIF_NEED_RESCHED); + +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 20) + return need_resched(); + +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 1, 110) + return current->need_resched != 0; + +#else + return need_resched != 0; +#endif +} + + +RTDECL(void) RTThreadPreemptDisable(PRTTHREADPREEMPTSTATE pState) +{ + AssertPtr(pState); + Assert(pState->uchDummy != 42); + pState->uchDummy = 42; + + /* + * Note: This call is a NOP if CONFIG_PREEMPT is not enabled in the Linux kernel + * configuration. In that case, schedule() is only called need_resched() is set + * which is tested just before we return to R3 (not when returning from R0 to R0). + */ + preempt_disable(); +} + + +RTDECL(void) RTThreadPreemptRestore(PRTTHREADPREEMPTSTATE pState) +{ + AssertPtr(pState); + Assert(pState->uchDummy == 42); + pState->uchDummy = 0; + + preempt_enable(); +} + Index: /trunk/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c =================================================================== --- /trunk/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c (revision 19936) +++ /trunk/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c (revision 19937) @@ -48,26 +48,3 @@ -RTDECL(bool) RTThreadPreemptIsEnabled(RTTHREAD hThread) -{ - Assert(hThread == NIL_RTTHREAD); - return !in_atomic() && !irqs_disabled(); -} - -RTDECL(bool) RTThreadPreemptIsPending(RTTHREAD hThread) -{ - Assert(hThread == NIL_RTTHREAD); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 4) - return test_tsk_thread_flag(current, TIF_NEED_RESCHED); - -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 20) - return need_resched(); - -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 1, 110) - return current->need_resched != 0; - -#else - return need_resched != 0; -#endif -} -