Module Name: src
Committed By: maxv
Date: Sat Jul 14 14:34:32 UTC 2018
Modified Files:
src/sys/arch/x86/x86: patch.c
Log Message:
Remove ifdef GPROF.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/x86/x86/patch.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/x86/x86/patch.c
diff -u src/sys/arch/x86/x86/patch.c:1.34 src/sys/arch/x86/x86/patch.c:1.35
--- src/sys/arch/x86/x86/patch.c:1.34 Tue Mar 13 16:52:42 2018
+++ src/sys/arch/x86/x86/patch.c Sat Jul 14 14:34:32 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: patch.c,v 1.34 2018/03/13 16:52:42 maxv Exp $ */
+/* $NetBSD: patch.c,v 1.35 2018/07/14 14:34:32 maxv Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: patch.c,v 1.34 2018/03/13 16:52:42 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: patch.c,v 1.35 2018/07/14 14:34:32 maxv Exp $");
#include "opt_lockdebug.h"
#ifdef i386
@@ -119,17 +119,6 @@ patchfunc(void *from_s, void *from_e, vo
memcpy(to_s, from_s, (uintptr_t)to_e - (uintptr_t)to_s);
if (pcrel != NULL)
adjust_jumpoff(pcrel, from_s, to_s);
-
-#ifdef GPROF
-#ifdef i386
-#define MCOUNT_CALL_OFFSET 3
-#endif
-#ifdef __x86_64__
-#define MCOUNT_CALL_OFFSET 5
-#endif
- /* Patch mcount call offset */
- adjust_jumpoff((uint8_t *)from_s + MCOUNT_CALL_OFFSET, from_s, to_s);
-#endif
}
static inline void __unused
@@ -209,7 +198,6 @@ x86_patch(bool early)
x86_patch_window_open(&psl, &cr0);
-#if !defined(GPROF)
if (!early && ncpu == 1) {
#ifndef LOCKDEBUG
/*
@@ -244,7 +232,6 @@ x86_patch(bool early)
NULL
);
}
-#endif /* GPROF */
#ifdef i386
/*
