Module Name: src
Committed By: skrll
Date: Sat May 2 16:20:41 UTC 2015
Modified Files:
src/sys/arch/arm/arm: arm_machdep.c
Log Message:
Remove unintended commit
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arm/arm/arm_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/arm_machdep.c
diff -u src/sys/arch/arm/arm/arm_machdep.c:1.48 src/sys/arch/arm/arm/arm_machdep.c:1.49
--- src/sys/arch/arm/arm/arm_machdep.c:1.48 Sat May 2 16:18:49 2015
+++ src/sys/arch/arm/arm/arm_machdep.c Sat May 2 16:20:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_machdep.c,v 1.48 2015/05/02 16:18:49 skrll Exp $ */
+/* $NetBSD: arm_machdep.c,v 1.49 2015/05/02 16:20:41 skrll Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.48 2015/05/02 16:18:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.49 2015/05/02 16:20:41 skrll Exp $");
#include <sys/exec.h>
#include <sys/proc.h>
@@ -187,7 +187,7 @@ setregs(struct lwp *l, struct exec_packa
tf->tf_spsr = PSR_USR32_MODE | (CPU_IS_ARMV7_P() ? PSR_E_BIT : 0);
#else
tf->tf_spsr = PSR_USR32_MODE;
-#endif /* __ARMEB__ */
+#endif /* __ARMEB__ */
#ifdef THUMB_CODE
if (pack->ep_entry & 1)
@@ -213,7 +213,7 @@ setregs(struct lwp *l, struct exec_packa
void
startlwp(void *arg)
{
- ucontext_t *uc = (ucontext_t *)arg;
+ ucontext_t *uc = (ucontext_t *)arg;
lwp_t *l = curlwp;
int error __diagused;
@@ -243,11 +243,9 @@ cpu_need_resched(struct cpu_info *ci, in
*/
return;
}
-#if 0
- /* XXXNH??? */
if (ci->ci_want_resched && !immed)
return;
-#endif
+
if (l == ci->ci_data.cpu_idlelwp) {
#ifdef MULTIPROCESSOR
/*
