On Sun, 2003-03-16 at 21:40, Keith Owens wrote:

> 2.4.{19,20}-common-1

The attached patch is needeed to kdb common to build on sparc64.

* include/linux/kdb.h references task_struct, needs to include sched.h
* kdb/kdbmain.c #define's WRAP already defined in
     include/asm-sparc64/termbits.h

-- 

Thomas Duffy <[EMAIL PROTECTED]>
--- linux-2.4.20+kdb/include/linux/kdb.h        2003-03-18 09:28:44.000000000 -0800
+++ linux-2.4.20+kdb+sparc64/include/linux/kdb.h        2003-03-18 10:08:19.000000000 
-0800
@@ -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
--- linux-2.4.20+kdb/kdb/kdbmain.c      2003-03-18 09:28:44.000000000 -0800
+++ linux-2.4.20+kdb+sparc64/kdb/kdbmain.c      2003-03-18 10:36:28.000000000 -0800
@@ -2567,17 +2567,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;
                                }
                        }
@@ -2592,7 +2592,7 @@
                if (!*start) {
                        while (!*start) {
                                ++start;
-                               WRAP(start);
+                               KDB_WRAP(start);
                                if (start == end)
                                        break;
                        }
@@ -2604,7 +2604,7 @@
                        c = *start;
                        ++chars;
                        ++start;
-                       WRAP(start);
+                       KDB_WRAP(start);
                        if (start == end || c == '\n')
                                break;
                }

Reply via email to