diff -Nur -X /home/tduffy/dontdiff linux-2.4.20+kdb-v4.2/include/linux/kdb.h linux-2.4.20+kdb-v4.2+sparc64/include/linux/kdb.h
--- linux-2.4.20+kdb-v4.2/include/linux/kdb.h	2003-05-02 10:29:34.000000000 -0700
+++ linux-2.4.20+kdb-v4.2+sparc64/include/linux/kdb.h	2003-05-02 11:45:27.000000000 -0700
@@ -38,6 +38,7 @@
 
 #include <linux/config.h>
 #include <linux/init.h>
+#include <linux/sched.h>
 #include <asm/kdb.h>
 
 #define KDB_MAJOR_VERSION	4
diff -Nur -X /home/tduffy/dontdiff linux-2.4.20+kdb-v4.2/kdb/kdbmain.c linux-2.4.20+kdb-v4.2+sparc64/kdb/kdbmain.c
--- linux-2.4.20+kdb-v4.2/kdb/kdbmain.c	2003-05-02 10:29:34.000000000 -0700
+++ linux-2.4.20+kdb-v4.2+sparc64/kdb/kdbmain.c	2003-05-02 10:37:15.000000000 -0700
@@ -2570,17 +2570,17 @@
 	logsize = syslog_data[1] - syslog_data[0];
 	start = syslog_data[0] + (syslog_data[2] - syslog_data[0]) % logsize;
 	end = syslog_data[0] + (syslog_data[3] - syslog_data[0]) % logsize;
-#define WRAP(p) if (p < syslog_data[0]) p = syslog_data[1]-1; else if (p >= syslog_data[1]) p = syslog_data[0]
+#define KDB_WRAP(p) if (p < syslog_data[0]) p = syslog_data[1]-1; else if (p >= syslog_data[1]) p = syslog_data[0]
 	if (lines) {
 		char *p = end;
 		++lines;
 		do {
 			--p;
-			WRAP(p);
+			KDB_WRAP(p);
 			if (*p == '\n') {
 				if (--lines == 0) {
 					++p;
-					WRAP(p);
+					KDB_WRAP(p);
 					break;
 				}
 			}
@@ -2595,7 +2595,7 @@
 		if (!*start) {
 			while (!*start) {
 				++start;
-				WRAP(start);
+				KDB_WRAP(start);
 				if (start == end)
 					break;
 			}
@@ -2607,7 +2607,7 @@
 			c = *start;
 			++chars;
 			++start;
-			WRAP(start);
+			KDB_WRAP(start);
 			if (start == end || c == '\n')
 				break;
 		}