From b747d346aea8977bf0c7f86cd665f7d98461db41 Mon Sep 17 00:00:00 2001
From: Jordan Gordeev <jgordeev@dir.bg>
Date: Sat, 6 Jun 2009 00:07:57 +0300
Subject: [PATCH] amd64: Remove or disable most uses of kprintf0().

---
 sys/kern/init_main.c              |  4 ----
 sys/platform/pc64/amd64/machdep.c |  4 ----
 sys/platform/pc64/amd64/trap.c    | 10 ++--------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 3e4520f488..f6e2c4eed1 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -194,8 +194,6 @@ mi_startup(void)
 	struct sysinit **xipp;		/* interior loop of sort*/
 	struct sysinit *save;		/* bubble*/
 
-	//kprintf0("mi_startup\n");
-
 	if (sysinit == NULL) {
 		sysinit = SET_BEGIN(sysinit_set);
 		sysinit_end = SET_LIMIT(sysinit_set);
@@ -233,8 +231,6 @@ restart:
 		if (sip->subsystem == SI_SPECIAL_DONE)
 			continue;
 
-		//kprintf0("!%s!", sip->name);
-
 		/* Call function */
 		(*(sip->func))(sip->udata);
 
diff --git a/sys/platform/pc64/amd64/machdep.c b/sys/platform/pc64/amd64/machdep.c
index 7a92b57155..e54154087d 100644
--- a/sys/platform/pc64/amd64/machdep.c
+++ b/sys/platform/pc64/amd64/machdep.c
@@ -443,7 +443,6 @@ again:
 void
 sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code)
 {
-	kprintf0("sendsig\n");
 	struct lwp *lp = curthread->td_lwp;
 	struct proc *p = lp->lwp_proc;
 	struct trapframe *regs;
@@ -599,7 +598,6 @@ sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code)
 int
 cpu_sanitize_frame(struct trapframe *frame)
 {
-	kprintf0("cpu_sanitize_frame\n");
 	frame->tf_cs = _ucodesel;
 	frame->tf_ss = _udatasel;
 	/* XXX VM (8086) mode not supported? */
@@ -1039,8 +1037,6 @@ exec_setregs(u_long entry, u_long stack, u_long ps_strings)
 	struct pcb *pcb = td->td_pcb;
 	struct trapframe *regs = lp->lwp_md.md_regs;
 
-	kprintf0("exec_setregs\n");
-
 	/* was i386_user_cleanup() in NetBSD */
 	user_ldt_free(pcb);
   
diff --git a/sys/platform/pc64/amd64/trap.c b/sys/platform/pc64/amd64/trap.c
index 1299eff564..d7ed5b06e0 100644
--- a/sys/platform/pc64/amd64/trap.c
+++ b/sys/platform/pc64/amd64/trap.c
@@ -377,7 +377,7 @@ trap(struct trapframe *frame)
 
 	p = td->td_proc;
 
-#ifndef JG
+#ifdef JG
 	kprintf0("TRAP ");
 	kprintf0("\"%s\" type=%ld\n",
 		trap_msg[frame->tf_trapno], frame->tf_trapno);
@@ -623,7 +623,7 @@ trap(struct trapframe *frame)
 			 * selectors and pointers when the user changes
 			 * them.
 			 */
-			kprintf0("trap.c line %d\n", __LINE__);
+			kprintf("trap.c line %d\n", __LINE__);
 			if (mycpu->gd_intr_nesting_level == 0) {
 				if (td->td_pcb->pcb_onfault) {
 					frame->tf_rip = (register_t)
@@ -1045,11 +1045,9 @@ syscall2(struct trapframe *frame)
 	int reg, regcnt;
 	union sysunion args;
 	register_t *argsdst;
-	kprintf0("SYSCALL rip = %016llx\n", frame->tf_rip);
 
 	PCPU_INC(cnt.v_syscall);
 
-	kprintf0("\033[31mSYSCALL %ld\033[39m\n", frame->tf_rax);
 #ifdef DIAGNOSTIC
 	if (ISPL(frame->tf_cs) != SEL_UPL) {
 		get_mplock();
@@ -1204,7 +1202,6 @@ out:
 		lp = curthread->td_lwp;
 		frame->tf_rax = args.sysmsg_fds[0];
 		frame->tf_rdx = args.sysmsg_fds[1];
-		kprintf0("RESULT %lld %lld\n", frame->tf_rax, frame->tf_rdx);
 		frame->tf_rflags &= ~PSL_C;
 		break;
 	case ERESTART:
@@ -1229,7 +1226,6 @@ bad:
 			else
 				error = p->p_sysent->sv_errtbl[error];
 		}
-		kprintf0("ERROR %d\n", error);
 		frame->tf_rax = error;
 		frame->tf_rflags |= PSL_C;
 		break;
@@ -1284,7 +1280,6 @@ bad:
 void
 fork_return(struct lwp *lp, struct trapframe *frame)
 {
-	kprintf0("fork return\n");
 	frame->tf_rax = 0;		/* Child returns zero */
 	frame->tf_rflags &= ~PSL_C;	/* success */
 	frame->tf_rdx = 1;
@@ -1302,7 +1297,6 @@ fork_return(struct lwp *lp, struct trapframe *frame)
 void
 generic_lwp_return(struct lwp *lp, struct trapframe *frame)
 {
-	kprintf0("generic_lwp_return\n");
 	struct proc *p = lp->lwp_proc;
 
 	/*
-- 
2.41.0