Update of /cvsroot/ssic-linux/openssi/kernel.patches/common
In directory sc8-pr-cvs1:/tmp/cvs-serv11181
Modified Files:
Tag: OPENSSI-RH
kdb-v2.3-2.4.18-common-2-ssi
Log Message:
M openssi/kernel.patch/common/kdb-v2.3-2.4.18-common-2-ssi
Fixed issue where quitting out of debugging function could
leave the "more" prompt enabled for ordinary printks.
Index: kdb-v2.3-2.4.18-common-2-ssi
===================================================================
RCS file:
/cvsroot/ssic-linux/openssi/kernel.patches/common/kdb-v2.3-2.4.18-common-2-ssi,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** kdb-v2.3-2.4.18-common-2-ssi 14 Jun 2003 01:44:33 -0000 1.1.2.2
--- kdb-v2.3-2.4.18-common-2-ssi 20 Aug 2003 20:22:59 -0000 1.1.2.3
***************
*** 1,5 ****
! diff -Nar -u4 o/cluster/ics/ics_tcp/ics_llmgmt.c
n/cluster/ics/ics_tcp/ics_llmgmt.c
! --- o/cluster/ics/ics_tcp/ics_llmgmt.c 2003-06-13 13:15:59.000000000
-0700
! +++ n/cluster/ics/ics_tcp/ics_llmgmt.c 2003-06-13 14:01:31.000000000
-0700
@@ -43,8 +43,11 @@
#include <cluster/ics.h> /* Must be after <ics_private.h> */
--- 1,5 ----
! diff -Nar -u4 orig/cluster/ics/ics_tcp/ics_llmgmt.c
new/cluster/ics/ics_tcp/ics_llmgmt.c
! --- orig/cluster/ics/ics_tcp/ics_llmgmt.c 2003-08-07 16:11:20.000000000
-0700
! +++ new/cluster/ics/ics_tcp/ics_llmgmt.c 2003-08-19 14:54:49.000000000
-0700
@@ -43,8 +43,11 @@
#include <cluster/ics.h> /* Must be after <ics_private.h> */
***************
*** 14,18 ****
static void ics_probe_clms_daemon(void *);
static void ics_accept_connection(void *);
! @@ -1022,8 +1025,12 @@
#ifndef NSC_RGP
/* Process "imalive" packet. */
--- 14,18 ----
static void ics_probe_clms_daemon(void *);
static void ics_accept_connection(void *);
! @@ -926,8 +929,12 @@
#ifndef NSC_RGP
/* Process "imalive" packet. */
***************
*** 27,33 ****
if (hdr->uicsh_type & ICS_UNACK_LOAD) {
load_array_t *loadptr;
! diff -Nar -u4 o/cluster/Rules.make n/cluster/Rules.make
! --- o/cluster/Rules.make 2003-06-03 15:22:22.000000000 -0700
! +++ n/cluster/Rules.make 2003-06-13 14:01:31.000000000 -0700
@@ -9,8 +9,9 @@
#
--- 27,33 ----
if (hdr->uicsh_type & ICS_UNACK_LOAD) {
load_array_t *loadptr;
! diff -Nar -u4 orig/cluster/Rules.make new/cluster/Rules.make
! --- orig/cluster/Rules.make 2003-06-03 15:22:22.000000000 -0700
! +++ new/cluster/Rules.make 2003-08-19 14:54:49.000000000 -0700
@@ -9,8 +9,9 @@
#
***************
*** 40,47 ****
ARCHLINK ?= arch
! diff -Nar -u4 o/cluster/ssi/vproc/nsc_initproc.c
n/cluster/ssi/vproc/nsc_initproc.c
! --- o/cluster/ssi/vproc/nsc_initproc.c 2003-06-12 16:20:36.000000000
-0700
! +++ n/cluster/ssi/vproc/nsc_initproc.c 2003-06-13 14:01:32.000000000
-0700
! @@ -131,8 +131,14 @@
if (init_node != this_node) {
ssidev_discover_devfs();
--- 40,47 ----
ARCHLINK ?= arch
! diff -Nar -u4 orig/cluster/ssi/vproc/nsc_initproc.c
new/cluster/ssi/vproc/nsc_initproc.c
! --- orig/cluster/ssi/vproc/nsc_initproc.c 2003-06-23 14:15:21.000000000
-0700
! +++ new/cluster/ssi/vproc/nsc_initproc.c 2003-08-19 14:54:49.000000000
-0700
! @@ -130,8 +130,14 @@
if (init_node != this_node) {
ssidev_discover_devfs();
***************
*** 58,64 ****
vproc_child_reaper_ready = 1;
! diff -Nar -u4 o/cluster/util/node_monitor.c n/cluster/util/node_monitor.c
! --- o/cluster/util/node_monitor.c 2003-06-13 13:15:59.000000000 -0700
! +++ n/cluster/util/node_monitor.c 2003-06-13 14:01:32.000000000 -0700
@@ -31,8 +31,12 @@
* processing to take place.
--- 58,64 ----
vproc_child_reaper_ready = 1;
! diff -Nar -u4 orig/cluster/util/node_monitor.c new/cluster/util/node_monitor.c
! --- orig/cluster/util/node_monitor.c 2003-06-20 23:51:50.000000000 -0700
! +++ new/cluster/util/node_monitor.c 2003-08-19 14:54:49.000000000 -0700
@@ -31,8 +31,12 @@
* processing to take place.
***************
*** 74,78 ****
static void nm_master_send_daemon(void *);
static void nm_master_check_and_send(unsigned long);
! @@ -291,15 +295,21 @@
/* XXX: Fill in loadinfo message. */
--- 74,78 ----
static void nm_master_send_daemon(void *);
static void nm_master_check_and_send(unsigned long);
! @@ -288,15 +292,21 @@
/* XXX: Fill in loadinfo message. */
***************
*** 96,100 ****
0);
#endif /* !CONFIG_LDLVL */
! @@ -423,13 +433,19 @@
clnt_info.load = avenrun[0];
clnt_info.mem = 0;
--- 96,100 ----
0);
#endif /* !CONFIG_LDLVL */
! @@ -419,13 +429,19 @@
clnt_info.load = avenrun[0];
clnt_info.mem = 0;
***************
*** 116,122 ****
0);
#endif /* !CONFIG_LDLVL */
! diff -Nar -u4 o/Documentation/Configure.help n/Documentation/Configure.help
! --- o/Documentation/Configure.help 2003-06-11 18:19:31.000000000 -0700
! +++ n/Documentation/Configure.help 2003-06-13 14:01:32.000000000 -0700
@@ -20176,8 +20176,49 @@
send a BREAK and then within 5 seconds a command keypress. The
--- 116,122 ----
0);
#endif /* !CONFIG_LDLVL */
! diff -Nar -u4 orig/Documentation/Configure.help
new/Documentation/Configure.help
! --- orig/Documentation/Configure.help 2003-06-11 18:19:31.000000000 -0700
! +++ new/Documentation/Configure.help 2003-08-19 14:54:49.000000000 -0700
@@ -20176,8 +20176,49 @@
send a BREAK and then within 5 seconds a command keypress. The
***************
*** 169,175 ****
ISDN ("Integrated Services Digital Networks", called RNIS in France)
is a special type of fully digital telephone service; it's mostly
! diff -Nar -u4 o/Documentation/kdb/kdb_bp.man n/Documentation/kdb/kdb_bp.man
! --- o/Documentation/kdb/kdb_bp.man 1969-12-31 16:00:00.000000000 -0800
! +++ n/Documentation/kdb/kdb_bp.man 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,180 @@
+.TH BD 1 "17 January 2002"
--- 169,175 ----
ISDN ("Integrated Services Digital Networks", called RNIS in France)
is a special type of fully digital telephone service; it's mostly
! diff -Nar -u4 orig/Documentation/kdb/kdb_bp.man
new/Documentation/kdb/kdb_bp.man
! --- orig/Documentation/kdb/kdb_bp.man 1969-12-31 16:00:00.000000000 -0800
! +++ new/Documentation/kdb/kdb_bp.man 2003-08-19 14:54:49.000000000 -0700
@@ -0,0 +1,180 @@
+.TH BD 1 "17 January 2002"
***************
*** 353,359 ****
+bc *
+Clear all breakpoints
! diff -Nar -u4 o/Documentation/kdb/kdb_bt.man n/Documentation/kdb/kdb_bt.man
! --- o/Documentation/kdb/kdb_bt.man 1969-12-31 16:00:00.000000000 -0800
! +++ n/Documentation/kdb/kdb_bt.man 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,176 @@
+.TH BT 1 "17 January 2002"
--- 353,359 ----
+bc *
+Clear all breakpoints
! diff -Nar -u4 orig/Documentation/kdb/kdb_bt.man
new/Documentation/kdb/kdb_bt.man
! --- orig/Documentation/kdb/kdb_bt.man 1969-12-31 16:00:00.000000000 -0800
! +++ new/Documentation/kdb/kdb_bt.man 2003-08-19 14:54:49.000000000 -0700
@@ -0,0 +1,176 @@
+.TH BT 1 "17 January 2002"
***************
*** 533,539 ****
+ 0xc01095f8 system_call+0x34
+ kernel .text 0xc0100000 0xc01095c4 0xc01095fc
! diff -Nar -u4 o/Documentation/kdb/kdb_env.man n/Documentation/kdb/kdb_env.man
! --- o/Documentation/kdb/kdb_env.man 1969-12-31 16:00:00.000000000 -0800
! +++ n/Documentation/kdb/kdb_env.man 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,46 @@
+.TH ENV 1 "24 September 2000"
--- 533,539 ----
+ 0xc01095f8 system_call+0x34
+ kernel .text 0xc0100000 0xc01095c4 0xc01095fc
! diff -Nar -u4 orig/Documentation/kdb/kdb_env.man
new/Documentation/kdb/kdb_env.man
! --- orig/Documentation/kdb/kdb_env.man 1969-12-31 16:00:00.000000000
-0800
! +++ new/Documentation/kdb/kdb_env.man 2003-08-19 14:54:49.000000000 -0700
@@ -0,0 +1,46 @@
+.TH ENV 1 "24 September 2000"
***************
*** 583,589 ****
+Set the number of lines to display for the \fBid\fP command
+to the value \fI100\fP.
! diff -Nar -u4 o/Documentation/kdb/kdb_ll.man n/Documentation/kdb/kdb_ll.man
! --- o/Documentation/kdb/kdb_ll.man 1969-12-31 16:00:00.000000000 -0800
! +++ n/Documentation/kdb/kdb_ll.man 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,134 @@
+.TH LL 1 "19 April 1999"
--- 583,589 ----
+Set the number of lines to display for the \fBid\fP command
+to the value \fI100\fP.
! diff -Nar -u4 orig/Documentation/kdb/kdb_ll.man
new/Documentation/kdb/kdb_ll.man
! --- orig/Documentation/kdb/kdb_ll.man 1969-12-31 16:00:00.000000000 -0800
! +++ new/Documentation/kdb/kdb_ll.man 2003-08-19 14:54:49.000000000 -0700
@@ -0,0 +1,134 @@
+.TH LL 1 "19 April 1999"
***************
*** 721,727 ****
+flags: READ WRITE EXEC MAYREAD MAYWRITE MAYEXEC GROWSDOWN
+kdb>
! diff -Nar -u4 o/Documentation/kdb/kdb_md.man n/Documentation/kdb/kdb_md.man
! --- o/Documentation/kdb/kdb_md.man 1969-12-31 16:00:00.000000000 -0800
! +++ n/Documentation/kdb/kdb_md.man 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,125 @@
+.TH MD 1 "25 September, 2001"
--- 721,727 ----
+flags: READ WRITE EXEC MAYREAD MAYWRITE MAYEXEC GROWSDOWN
+kdb>
! diff -Nar -u4 orig/Documentation/kdb/kdb_md.man
new/Documentation/kdb/kdb_md.man
! --- orig/Documentation/kdb/kdb_md.man 1969-12-31 16:00:00.000000000 -0800
! +++ new/Documentation/kdb/kdb_md.man 2003-08-19 14:54:49.000000000 -0700
@@ -0,0 +1,125 @@
+.TH MD 1 "25 September, 2001"
***************
*** 850,856 ****
+Display 15 lines (at 16 bytes per line) starting at address
+represented by the symbol \fIchrdev_table\fP.
! diff -Nar -u4 o/Documentation/kdb/kdb.mm n/Documentation/kdb/kdb.mm
! --- o/Documentation/kdb/kdb.mm 1969-12-31 16:00:00.000000000 -0800
! +++ n/Documentation/kdb/kdb.mm 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,297 @@
+.TH KDB 8 "17 January 2002"
--- 850,856 ----
+Display 15 lines (at 16 bytes per line) starting at address
+represented by the symbol \fIchrdev_table\fP.
! diff -Nar -u4 orig/Documentation/kdb/kdb.mm new/Documentation/kdb/kdb.mm
! --- orig/Documentation/kdb/kdb.mm 1969-12-31 16:00:00.000000000 -0800
! +++ new/Documentation/kdb/kdb.mm 2003-08-19 14:54:49.000000000 -0700
@@ -0,0 +1,297 @@
+.TH KDB 8 "17 January 2002"
***************
*** 1151,1157 ****
+.P
+linux/Documentation/kdb/kdb_{bp,bt,env,ll,md,rd,ss}.man
! diff -Nar -u4 o/Documentation/kdb/kdb_rd.man n/Documentation/kdb/kdb_rd.man
! --- o/Documentation/kdb/kdb_rd.man 1969-12-31 16:00:00.000000000 -0800
! +++ n/Documentation/kdb/kdb_rd.man 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,81 @@
+.TH RD 1 "17 January 2002"
--- 1151,1157 ----
+.P
+linux/Documentation/kdb/kdb_{bp,bt,env,ll,md,rd,ss}.man
! diff -Nar -u4 orig/Documentation/kdb/kdb_rd.man
new/Documentation/kdb/kdb_rd.man
! --- orig/Documentation/kdb/kdb_rd.man 1969-12-31 16:00:00.000000000 -0800
! +++ new/Documentation/kdb/kdb_rd.man 2003-08-19 14:54:49.000000000 -0700
@@ -0,0 +1,81 @@
+.TH RD 1 "17 January 2002"
***************
*** 1236,1242 ****
+rm dr0 0xc1287220
+Set the value of the \fBdr0\fB register to \f(CW0xc1287220\fP.
! diff -Nar -u4 o/Documentation/kdb/kdb_ss.man n/Documentation/kdb/kdb_ss.man
! --- o/Documentation/kdb/kdb_ss.man 1969-12-31 16:00:00.000000000 -0800
! +++ n/Documentation/kdb/kdb_ss.man 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,109 @@
+.TH SS 1 "17 January 2002"
--- 1236,1242 ----
+rm dr0 0xc1287220
+Set the value of the \fBdr0\fB register to \f(CW0xc1287220\fP.
! diff -Nar -u4 orig/Documentation/kdb/kdb_ss.man
new/Documentation/kdb/kdb_ss.man
! --- orig/Documentation/kdb/kdb_ss.man 1969-12-31 16:00:00.000000000 -0800
! +++ new/Documentation/kdb/kdb_ss.man 2003-08-19 14:54:49.000000000 -0700
@@ -0,0 +1,109 @@
+.TH SS 1 "17 January 2002"
***************
*** 1349,1355 ****
+[0]kdb>
+
! diff -Nar -u4 o/Documentation/kdb/slides n/Documentation/kdb/slides
! --- o/Documentation/kdb/slides 1969-12-31 16:00:00.000000000 -0800
! +++ n/Documentation/kdb/slides 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,1383 @@
+#! /opt/cpg/bin/do-mgp
--- 1349,1355 ----
+[0]kdb>
+
! diff -Nar -u4 orig/Documentation/kdb/slides new/Documentation/kdb/slides
! --- orig/Documentation/kdb/slides 1969-12-31 16:00:00.000000000 -0800
! +++ new/Documentation/kdb/slides 2003-08-19 14:54:49.000000000 -0700
@@ -0,0 +1,1383 @@
+#! /opt/cpg/bin/do-mgp
***************
*** 2736,2742 ****
+DIRTY page_struct index cnt flags
+LOCKED page_struct index cnt flags
! diff -Nar -u4 o/drivers/char/keyboard.c n/drivers/char/keyboard.c
! --- o/drivers/char/keyboard.c 2002-12-20 16:32:02.000000000 -0800
! +++ n/drivers/char/keyboard.c 2003-06-13 14:01:32.000000000 -0700
@@ -44,8 +44,11 @@
#include <linux/pm.h>
--- 2736,2742 ----
+DIRTY page_struct index cnt flags
+LOCKED page_struct index cnt flags
! diff -Nar -u4 orig/drivers/char/keyboard.c new/drivers/char/keyboard.c
! --- orig/drivers/char/keyboard.c 2002-12-20 16:32:02.000000000 -0800
! +++ new/drivers/char/keyboard.c 2003-08-19 14:54:49.000000000 -0700
@@ -44,8 +44,11 @@
#include <linux/pm.h>
***************
*** 2767,2773 ****
sysrq_pressed = !up_flag;
goto out;
! diff -Nar -u4 o/drivers/char/serial.c n/drivers/char/serial.c
! --- o/drivers/char/serial.c 2002-12-20 16:32:45.000000000 -0800
! +++ n/drivers/char/serial.c 2003-06-13 14:01:32.000000000 -0700
@@ -227,8 +227,31 @@
#ifdef CONFIG_MAGIC_SYSRQ
--- 2767,2773 ----
sysrq_pressed = !up_flag;
goto out;
! diff -Nar -u4 orig/drivers/char/serial.c new/drivers/char/serial.c
! --- orig/drivers/char/serial.c 2002-12-20 16:32:45.000000000 -0800
! +++ new/drivers/char/serial.c 2003-08-19 14:54:49.000000000 -0700
@@ -227,8 +227,31 @@
#ifdef CONFIG_MAGIC_SYSRQ
***************
*** 2850,2856 ****
static struct console sercons = {
! diff -Nar -u4 o/drivers/usb/hid-core.c n/drivers/usb/hid-core.c
! --- o/drivers/usb/hid-core.c 2002-12-20 16:31:54.000000000 -0800
! +++ n/drivers/usb/hid-core.c 2003-06-13 14:01:32.000000000 -0700
@@ -56,8 +56,28 @@
#define DRIVER_VERSION "v1.8.1"
--- 2850,2856 ----
static struct console sercons = {
! diff -Nar -u4 orig/drivers/usb/hid-core.c new/drivers/usb/hid-core.c
! --- orig/drivers/usb/hid-core.c 2002-12-20 16:31:54.000000000 -0800
! +++ new/drivers/usb/hid-core.c 2003-08-19 14:54:49.000000000 -0700
@@ -56,8 +56,28 @@
#define DRIVER_VERSION "v1.8.1"
***************
*** 2902,2908 ****
static void hid_disconnect(struct usb_device *dev, void *ptr)
! diff -Nar -u4 o/drivers/usb/usbkbd.c n/drivers/usb/usbkbd.c
! --- o/drivers/usb/usbkbd.c 2001-09-14 14:04:07.000000000 -0700
! +++ n/drivers/usb/usbkbd.c 2003-06-13 14:01:32.000000000 -0700
@@ -76,8 +76,30 @@
char name[128];
--- 2902,2908 ----
static void hid_disconnect(struct usb_device *dev, void *ptr)
! diff -Nar -u4 orig/drivers/usb/usbkbd.c new/drivers/usb/usbkbd.c
! --- orig/drivers/usb/usbkbd.c 2001-09-14 14:04:07.000000000 -0700
! +++ new/drivers/usb/usbkbd.c 2003-08-19 14:54:49.000000000 -0700
@@ -76,8 +76,30 @@
char name[128];
***************
*** 2954,2960 ****
kbd->dr.value = 0x200;
kbd->dr.index = interface->bInterfaceNumber;
! diff -Nar -u4 o/drivers/usb/usb-uhci.c n/drivers/usb/usb-uhci.c
! --- o/drivers/usb/usb-uhci.c 2002-12-20 16:31:52.000000000 -0800
! +++ n/drivers/usb/usb-uhci.c 2003-06-13 14:01:32.000000000 -0700
@@ -39,9 +39,12 @@
#include <asm/uaccess.h>
--- 2954,2960 ----
kbd->dr.value = 0x200;
kbd->dr.index = interface->bInterfaceNumber;
! diff -Nar -u4 orig/drivers/usb/usb-uhci.c new/drivers/usb/usb-uhci.c
! --- orig/drivers/usb/usb-uhci.c 2002-12-20 16:31:52.000000000 -0800
! +++ new/drivers/usb/usb-uhci.c 2003-08-19 14:54:49.000000000 -0700
@@ -39,9 +39,12 @@
#include <asm/uaccess.h>
***************
*** 3100,3106 ****
INIT_LIST_HEAD (&s->urb_unlinked);
spin_lock_init (&s->urb_list_lock);
! diff -Nar -u4 o/include/cluster/ics/ics_tcp_sock_private.h
n/include/cluster/ics/ics_tcp_sock_private.h
! --- o/include/cluster/ics/ics_tcp_sock_private.h 2003-06-13
13:15:59.000000000 -0700
! +++ n/include/cluster/ics/ics_tcp_sock_private.h 2003-06-13
14:01:32.000000000 -0700
@@ -157,8 +157,9 @@
*/
--- 3100,3106 ----
INIT_LIST_HEAD (&s->urb_unlinked);
spin_lock_init (&s->urb_list_lock);
! diff -Nar -u4 orig/include/cluster/ics/ics_tcp_sock_private.h
new/include/cluster/ics/ics_tcp_sock_private.h
! --- orig/include/cluster/ics/ics_tcp_sock_private.h 2003-08-08
14:18:29.000000000 -0700
! +++ new/include/cluster/ics/ics_tcp_sock_private.h 2003-08-19
14:54:49.000000000 -0700
@@ -157,8 +157,9 @@
*/
***************
*** 3113,3120 ****
* Definitions needed to configure the TCP connections.
*/
! diff -Nar -u4 o/include/cluster/nsc.h n/include/cluster/nsc.h
! --- o/include/cluster/nsc.h 2003-06-03 15:22:31.000000000 -0700
! +++ n/include/cluster/nsc.h 2003-06-13 14:01:32.000000000 -0700
! @@ -190,8 +190,12 @@
extern int spawn_daemon_user_proc(const char *, struct file *, const char *);
extern dev_t nsc_getdev(const char *, boolean_t, boolean_t);
--- 3113,3120 ----
* Definitions needed to configure the TCP connections.
*/
! diff -Nar -u4 orig/include/cluster/nsc.h new/include/cluster/nsc.h
! --- orig/include/cluster/nsc.h 2003-06-20 23:51:51.000000000 -0700
! +++ new/include/cluster/nsc.h 2003-08-19 14:54:49.000000000 -0700
! @@ -197,8 +197,12 @@
extern int spawn_daemon_user_proc(const char *, struct file *, const char *);
extern dev_t nsc_getdev(const char *, boolean_t, boolean_t);
***************
*** 3129,3135 ****
* even if you pass GFP_KERNEL. This is a Good Thing.
*/
! diff -Nar -u4 o/include/linux/dis-asm.h n/include/linux/dis-asm.h
! --- o/include/linux/dis-asm.h 1969-12-31 16:00:00.000000000 -0800
! +++ n/include/linux/dis-asm.h 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,307 @@
+/* Interface between the opcode library and its callers.
--- 3129,3135 ----
* even if you pass GFP_KERNEL. This is a Good Thing.
*/
! diff -Nar -u4 orig/include/linux/dis-asm.h new/include/linux/dis-asm.h
! --- orig/include/linux/dis-asm.h 1969-12-31 16:00:00.000000000 -0800
! +++ new/include/linux/dis-asm.h 2003-08-19 14:54:49.000000000 -0700
@@ -0,0 +1,307 @@
+/* Interface between the opcode library and its callers.
***************
*** 3440,3447 ****
+
+#endif /* ! defined (DIS_ASM_H) */
! diff -Nar -u4 o/include/linux/kdb.h n/include/linux/kdb.h
! --- o/include/linux/kdb.h 1969-12-31 16:00:00.000000000 -0800
! +++ n/include/linux/kdb.h 2003-06-13 14:01:32.000000000 -0700
! @@ -0,0 +1,276 @@
+#ifndef _KDB_H
+#define _KDB_H
--- 3440,3447 ----
+
+#endif /* ! defined (DIS_ASM_H) */
! diff -Nar -u4 orig/include/linux/kdb.h new/include/linux/kdb.h
! --- orig/include/linux/kdb.h 1969-12-31 16:00:00.000000000 -0800
! +++ new/include/linux/kdb.h 2003-08-19 14:56:06.000000000 -0700
! @@ -0,0 +1,279 @@
+#ifndef _KDB_H
+#define _KDB_H
***************
*** 3674,3677 ****
--- 3674,3680 ----
+extern char *kdb_strdup(const char *str, int type);
+
+ +extern volatile int kdb_in_kdb;
+ +extern void kdb_vprintf(const char *fmt, va_list ap);
+ +
+#if defined(CONFIG_SMP)
+ /*
***************
*** 3720,3726 ****
+
+#endif /* !_KDB_H */
! diff -Nar -u4 o/include/linux/kdbprivate.h n/include/linux/kdbprivate.h
! --- o/include/linux/kdbprivate.h 1969-12-31 16:00:00.000000000 -0800
! +++ n/include/linux/kdbprivate.h 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,336 @@
+#ifndef _KDBPRIVATE_H
--- 3723,3729 ----
+
+#endif /* !_KDB_H */
! diff -Nar -u4 orig/include/linux/kdbprivate.h new/include/linux/kdbprivate.h
! --- orig/include/linux/kdbprivate.h 1969-12-31 16:00:00.000000000 -0800
! +++ new/include/linux/kdbprivate.h 2003-08-19 14:54:49.000000000 -0700
@@ -0,0 +1,336 @@
+#ifndef _KDBPRIVATE_H
***************
*** 4060,4066 ****
+
+#endif /* !_KDBPRIVATE_H */
! diff -Nar -u4 o/include/linux/sysctl.h n/include/linux/sysctl.h
! --- o/include/linux/sysctl.h 2002-12-20 16:31:57.000000000 -0800
! +++ n/include/linux/sysctl.h 2003-06-13 14:01:32.000000000 -0700
@@ -125,8 +125,9 @@
KERN_CORE_USES_PID=52, /* int: use core or core.%pid */
--- 4063,4069 ----
+
+#endif /* !_KDBPRIVATE_H */
! diff -Nar -u4 orig/include/linux/sysctl.h new/include/linux/sysctl.h
! --- orig/include/linux/sysctl.h 2002-12-20 16:31:57.000000000 -0800
! +++ new/include/linux/sysctl.h 2003-08-19 14:54:49.000000000 -0700
@@ -125,8 +125,9 @@
KERN_CORE_USES_PID=52, /* int: use core or core.%pid */
***************
*** 4073,4079 ****
/* CTL_VM names: */
! diff -Nar -u4 o/init/main.c n/init/main.c
! --- o/init/main.c 2003-06-11 18:19:34.000000000 -0700
! +++ n/init/main.c 2003-06-13 14:01:32.000000000 -0700
@@ -82,8 +82,12 @@
#include <linux/vproc.h>
--- 4076,4082 ----
/* CTL_VM names: */
! diff -Nar -u4 orig/init/main.c new/init/main.c
! --- orig/init/main.c 2003-07-18 17:31:03.000000000 -0700
! +++ new/init/main.c 2003-08-19 14:54:50.000000000 -0700
@@ -82,8 +82,12 @@
#include <linux/vproc.h>
***************
*** 4170,4178 ****
if (restart) {
! execve("/sbin/init.ssi",argv_restart_init,envp_init);
panic("No init.ssi found. Can't restart.");
! diff -Nar -u4 o/kdb/ChangeLog n/kdb/ChangeLog
! --- o/kdb/ChangeLog 1969-12-31 16:00:00.000000000 -0800
! +++ n/kdb/ChangeLog 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,525 @@
+2002-08-10 Keith Owens <kaos@xxxxxxx>
--- 4173,4181 ----
if (restart) {
! execve("/sbin/init",argv_restart_init,envp_init);
panic("No init.ssi found. Can't restart.");
! diff -Nar -u4 orig/kdb/ChangeLog new/kdb/ChangeLog
! --- orig/kdb/ChangeLog 1969-12-31 16:00:00.000000000 -0800
! +++ new/kdb/ChangeLog 2003-08-19 14:54:50.000000000 -0700
@@ -0,0 +1,525 @@
+2002-08-10 Keith Owens <kaos@xxxxxxx>
***************
*** 4701,4707 ****
+
+ * include/linux/kdb.h: add kdb_on, bump version to kdb v1.4.
! diff -Nar -u4 o/kdb/kdb_bp.c n/kdb/kdb_bp.c
! --- o/kdb/kdb_bp.c 1969-12-31 16:00:00.000000000 -0800
! +++ n/kdb/kdb_bp.c 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,633 @@
+/*
--- 4704,4710 ----
+
+ * include/linux/kdb.h: add kdb_on, bump version to kdb v1.4.
! diff -Nar -u4 orig/kdb/kdb_bp.c new/kdb/kdb_bp.c
! --- orig/kdb/kdb_bp.c 1969-12-31 16:00:00.000000000 -0800
! +++ new/kdb/kdb_bp.c 2003-08-19 14:54:50.000000000 -0700
@@ -0,0 +1,633 @@
+/*
***************
*** 5338,5344 ****
+}
+
! diff -Nar -u4 o/kdb/kdb_bt.c n/kdb/kdb_bt.c
! --- o/kdb/kdb_bt.c 1969-12-31 16:00:00.000000000 -0800
! +++ n/kdb/kdb_bt.c 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,141 @@
+/*
--- 5341,5347 ----
+}
+
! diff -Nar -u4 orig/kdb/kdb_bt.c new/kdb/kdb_bt.c
! --- orig/kdb/kdb_bt.c 1969-12-31 16:00:00.000000000 -0800
! +++ new/kdb/kdb_bt.c 2003-08-19 14:54:50.000000000 -0700
@@ -0,0 +1,141 @@
+/*
***************
*** 5483,5489 ****
+ return 0;
+}
! diff -Nar -u4 o/kdb/kdb_callfunc.c n/kdb/kdb_callfunc.c
! --- o/kdb/kdb_callfunc.c 1969-12-31 16:00:00.000000000 -0800
! +++ n/kdb/kdb_callfunc.c 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,96 @@
+/*
--- 5486,5492 ----
+ return 0;
+}
! diff -Nar -u4 orig/kdb/kdb_callfunc.c new/kdb/kdb_callfunc.c
! --- orig/kdb/kdb_callfunc.c 1969-12-31 16:00:00.000000000 -0800
! +++ new/kdb/kdb_callfunc.c 2003-08-19 14:54:50.000000000 -0700
@@ -0,0 +1,96 @@
+/*
***************
*** 5583,5589 ****
+ return 0;
+}
! diff -Nar -u4 o/kdb/kdb_cmds n/kdb/kdb_cmds
! --- o/kdb/kdb_cmds 1969-12-31 16:00:00.000000000 -0800
! +++ n/kdb/kdb_cmds 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,9 @@
+# Initial commands for kdb, alter to suit your needs.
--- 5586,5592 ----
+ return 0;
+}
! diff -Nar -u4 orig/kdb/kdb_cmds new/kdb/kdb_cmds
! --- orig/kdb/kdb_cmds 1969-12-31 16:00:00.000000000 -0800
! +++ new/kdb/kdb_cmds 2003-08-19 14:54:50.000000000 -0700
@@ -0,0 +1,9 @@
+# Initial commands for kdb, alter to suit your needs.
***************
*** 5596,5602 ****
+#mm nm_disabled 1
+#mm kdb_console_loglevel 8
! diff -Nar -u4 o/kdb/kdb_id.c n/kdb/kdb_id.c
! --- o/kdb/kdb_id.c 1969-12-31 16:00:00.000000000 -0800
! +++ n/kdb/kdb_id.c 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,263 @@
+/*
--- 5599,5605 ----
+#mm nm_disabled 1
+#mm kdb_console_loglevel 8
! diff -Nar -u4 orig/kdb/kdb_id.c new/kdb/kdb_id.c
! --- orig/kdb/kdb_id.c 1969-12-31 16:00:00.000000000 -0800
! +++ new/kdb/kdb_id.c 2003-08-19 14:54:50.000000000 -0700
@@ -0,0 +1,263 @@
+/*
***************
*** 5863,5869 ****
+ kdba_id_init(&kdb_di);
+}
! diff -Nar -u4 o/kdb/kdb_io.c n/kdb/kdb_io.c
! --- o/kdb/kdb_io.c 1969-12-31 16:00:00.000000000 -0800
! +++ n/kdb/kdb_io.c 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,322 @@
+/*
--- 5866,5872 ----
+ kdba_id_init(&kdb_di);
+}
! diff -Nar -u4 orig/kdb/kdb_io.c new/kdb/kdb_io.c
! --- orig/kdb/kdb_io.c 1969-12-31 16:00:00.000000000 -0800
! +++ new/kdb/kdb_io.c 2003-08-19 14:54:50.000000000 -0700
@@ -0,0 +1,322 @@
+/*
***************
*** 6189,6196 ****
+
+EXPORT_SYMBOL(kdb_read);
! diff -Nar -u4 o/kdb/kdbmain.c n/kdb/kdbmain.c
! --- o/kdb/kdbmain.c 1969-12-31 16:00:00.000000000 -0800
! +++ n/kdb/kdbmain.c 2003-06-13 14:01:32.000000000 -0700
! @@ -0,0 +1,2929 @@
+/*
+ * Minimalist Kernel Debugger
--- 6192,6199 ----
+
+EXPORT_SYMBOL(kdb_read);
! diff -Nar -u4 orig/kdb/kdbmain.c new/kdb/kdbmain.c
! --- orig/kdb/kdbmain.c 1969-12-31 16:00:00.000000000 -0800
! +++ new/kdb/kdbmain.c 2003-08-19 14:55:28.000000000 -0700
! @@ -0,0 +1,2930 @@
+/*
+ * Minimalist Kernel Debugger
***************
*** 7090,7093 ****
--- 7093,7097 ----
+ if (kdba_setjmp(&kdbjmpbuf[smp_processor_id()])) {
+ /* Command aborted (usually in pager) */
+ + kdb_in_kdb = 0;
+ continue;
+ }
***************
*** 9122,9128 ****
+EXPORT_SYMBOL(kdb_printf);
+EXPORT_SYMBOL(kdb_symbol_print);
! diff -Nar -u4 o/kdb/kdbsupport.c n/kdb/kdbsupport.c
! --- o/kdb/kdbsupport.c 1969-12-31 16:00:00.000000000 -0800
! +++ n/kdb/kdbsupport.c 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,650 @@
+/*
--- 9126,9132 ----
+EXPORT_SYMBOL(kdb_printf);
+EXPORT_SYMBOL(kdb_symbol_print);
! diff -Nar -u4 orig/kdb/kdbsupport.c new/kdb/kdbsupport.c
! --- orig/kdb/kdbsupport.c 1969-12-31 16:00:00.000000000 -0800
! +++ new/kdb/kdbsupport.c 2003-08-19 14:54:50.000000000 -0700
@@ -0,0 +1,650 @@
+/*
***************
*** 9776,9782 ****
+ return(diag);
+}
! diff -Nar -u4 o/kdb/Makefile n/kdb/Makefile
! --- o/kdb/Makefile 1969-12-31 16:00:00.000000000 -0800
! +++ n/kdb/Makefile 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,51 @@
+#
--- 9780,9786 ----
+ return(diag);
+}
! diff -Nar -u4 orig/kdb/Makefile new/kdb/Makefile
! --- orig/kdb/Makefile 1969-12-31 16:00:00.000000000 -0800
! +++ new/kdb/Makefile 2003-08-19 14:54:50.000000000 -0700
@@ -0,0 +1,51 @@
+#
***************
*** 9831,9837 ****
+ END {print "char __initdata *kdb_cmds[] = {"; for (i = 0; i <
cmds; ++i) {print " kdb_cmd" i ","}; print(" 0\n};");}' \
+ kdb_cmds > gen-kdb_cmds.c
! diff -Nar -u4 o/kdb/modules/kdbm_pg.c n/kdb/modules/kdbm_pg.c
! --- o/kdb/modules/kdbm_pg.c 1969-12-31 16:00:00.000000000 -0800
! +++ n/kdb/modules/kdbm_pg.c 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,548 @@
+/*
--- 9835,9841 ----
+ END {print "char __initdata *kdb_cmds[] = {"; for (i = 0; i <
cmds; ++i) {print " kdb_cmd" i ","}; print(" 0\n};");}' \
+ kdb_cmds > gen-kdb_cmds.c
! diff -Nar -u4 orig/kdb/modules/kdbm_pg.c new/kdb/modules/kdbm_pg.c
! --- orig/kdb/modules/kdbm_pg.c 1969-12-31 16:00:00.000000000 -0800
! +++ new/kdb/modules/kdbm_pg.c 2003-08-19 14:54:50.000000000 -0700
@@ -0,0 +1,548 @@
+/*
***************
*** 10383,10389 ****
+module_init(kdbm_pg_init)
+module_exit(kdbm_pg_exit)
! diff -Nar -u4 o/kdb/modules/kdbm_vm.c n/kdb/modules/kdbm_vm.c
! --- o/kdb/modules/kdbm_vm.c 1969-12-31 16:00:00.000000000 -0800
! +++ n/kdb/modules/kdbm_vm.c 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,403 @@
+/*
--- 10387,10393 ----
+module_init(kdbm_pg_init)
+module_exit(kdbm_pg_exit)
! diff -Nar -u4 orig/kdb/modules/kdbm_vm.c new/kdb/modules/kdbm_vm.c
! --- orig/kdb/modules/kdbm_vm.c 1969-12-31 16:00:00.000000000 -0800
! +++ new/kdb/modules/kdbm_vm.c 2003-08-19 14:54:50.000000000 -0700
@@ -0,0 +1,403 @@
+/*
***************
*** 10790,10796 ****
+module_init(kdbm_vm_init)
+module_exit(kdbm_vm_exit)
! diff -Nar -u4 o/kdb/modules/Makefile n/kdb/modules/Makefile
! --- o/kdb/modules/Makefile 1969-12-31 16:00:00.000000000 -0800
! +++ n/kdb/modules/Makefile 2003-06-13 14:01:32.000000000 -0700
@@ -0,0 +1,38 @@
+#
--- 10794,10800 ----
+module_init(kdbm_vm_init)
+module_exit(kdbm_vm_exit)
! diff -Nar -u4 orig/kdb/modules/Makefile new/kdb/modules/Makefile
! --- orig/kdb/modules/Makefile 1969-12-31 16:00:00.000000000 -0800
! +++ new/kdb/modules/Makefile 2003-08-19 14:54:50.000000000 -0700
@@ -0,0 +1,38 @@
+#
***************
*** 10832,10838 ****
+
+include $(TOPDIR)/Rules.make
! diff -Nar -u4 o/kernel/ksyms.c n/kernel/ksyms.c
! --- o/kernel/ksyms.c 2003-06-06 18:58:30.000000000 -0700
! +++ n/kernel/ksyms.c 2003-06-13 14:01:32.000000000 -0700
@@ -96,9 +96,9 @@
extern const char __start___kallsyms[];
--- 10836,10842 ----
+
+include $(TOPDIR)/Rules.make
! diff -Nar -u4 orig/kernel/ksyms.c new/kernel/ksyms.c
! --- orig/kernel/ksyms.c 2003-06-06 18:58:30.000000000 -0700
! +++ new/kernel/ksyms.c 2003-08-19 14:54:50.000000000 -0700
@@ -96,9 +96,9 @@
extern const char __start___kallsyms[];
***************
*** 10860,10867 ****
EXPORT_SYMBOL(vpop_setctty);
/* CONFIG_SSI - needed for GFS Network Block Device */
! diff -Nar -u4 o/kernel/printk.c n/kernel/printk.c
! --- o/kernel/printk.c 2002-12-20 16:31:29.000000000 -0800
! +++ n/kernel/printk.c 2003-06-13 14:01:32.000000000 -0700
! @@ -61,8 +61,12 @@
MINIMUM_CONSOLE_LOGLEVEL, /* minimum_console_loglevel */
DEFAULT_CONSOLE_LOGLEVEL, /* default_console_loglevel */
--- 10864,10883 ----
EXPORT_SYMBOL(vpop_setctty);
/* CONFIG_SSI - needed for GFS Network Block Device */
! diff -Nar -u4 orig/kernel/printk.c new/kernel/printk.c
! --- orig/kernel/printk.c 2002-12-20 16:31:29.000000000 -0800
! +++ new/kernel/printk.c 2003-08-19 14:55:45.000000000 -0700
! @@ -26,8 +26,11 @@
! #include <linux/module.h>
! #include <linux/interrupt.h> /* For in_interrupt() */
! #include <linux/config.h>
! #include <linux/delay.h>
! +#ifdef CONFIG_KDB
! +#include <linux/kdb.h>
! +#endif
!
! #include <asm/uaccess.h>
!
! #if defined(CONFIG_MULTIQUAD) || defined(CONFIG_IA64)
! @@ -61,8 +64,12 @@
MINIMUM_CONSOLE_LOGLEVEL, /* minimum_console_loglevel */
DEFAULT_CONSOLE_LOGLEVEL, /* default_console_loglevel */
***************
*** 10876,10880 ****
/*
* console_sem protects the console_drivers list, and also
! @@ -292,8 +296,22 @@
out:
return error;
--- 10892,10896 ----
/*
* console_sem protects the console_drivers list, and also
! @@ -292,8 +299,22 @@
out:
return error;
***************
*** 10899,10903 ****
if ((type != 3) && !capable(CAP_SYS_ADMIN))
return -EPERM;
! @@ -317,9 +335,14 @@
* Write out chars from start to end - 1 inclusive
*/
--- 10915,10919 ----
if ((type != 3) && !capable(CAP_SYS_ADMIN))
return -EPERM;
! @@ -317,9 +338,14 @@
* Write out chars from start to end - 1 inclusive
*/
***************
*** 10915,10919 ****
__call_console_drivers(start & LOG_BUF_MASK,
LOG_BUF_LEN);
__call_console_drivers(0, end & LOG_BUF_MASK);
! @@ -413,8 +436,26 @@
char *p;
static char printk_buf[1024];
--- 10931,10935 ----
__call_console_drivers(start & LOG_BUF_MASK,
LOG_BUF_LEN);
__call_console_drivers(0, end & LOG_BUF_MASK);
! @@ -413,8 +439,20 @@
char *p;
static char printk_buf[1024];
***************
*** 10921,10938 ****
+#ifdef CONFIG_KDB
! + {
! + extern volatile int kdb_in_kdb;
! + extern void kdb_vprintf(const char *fmt, va_list ap);
! +
! + if (kdb_in_kdb)
! + {
! + if (fmt[0] == '<' && fmt[1] >= '0' &&
! + fmt[1] <= '7' && fmt[2] == '>')
! + fmt += 3;
! + va_start(args, fmt);
! + kdb_vprintf(fmt, args);
! + va_end(args);
! + return 0;
! + }
+ }
+#endif /* CONFIG_KDB */
--- 10937,10948 ----
+#ifdef CONFIG_KDB
! + if (kdb_in_kdb) {
! + if (fmt[0] == '<' && fmt[1] >= '0' &&
! + fmt[1] <= '7' && fmt[2] == '>')
! + fmt += 3;
! + va_start(args, fmt);
! + kdb_vprintf(fmt, args);
! + va_end(args);
! + return 0;
+ }
+#endif /* CONFIG_KDB */
***************
*** 10942,10948 ****
spin_lock_init(&logbuf_lock);
/* And make sure that we print immediately */
! diff -Nar -u4 o/kernel/sysctl.c n/kernel/sysctl.c
! --- o/kernel/sysctl.c 2002-12-20 16:31:52.000000000 -0800
! +++ n/kernel/sysctl.c 2003-06-13 14:01:32.000000000 -0700
@@ -29,8 +29,11 @@
#include <linux/smp_lock.h>
--- 10952,10958 ----
spin_lock_init(&logbuf_lock);
/* And make sure that we print immediately */
! diff -Nar -u4 orig/kernel/sysctl.c new/kernel/sysctl.c
! --- orig/kernel/sysctl.c 2002-12-20 16:31:52.000000000 -0800
! +++ new/kernel/sysctl.c 2003-08-19 14:54:50.000000000 -0700
@@ -29,8 +29,11 @@
#include <linux/smp_lock.h>
***************
*** 10970,10976 ****
static ctl_table vm_table[] = {
! diff -Nar -u4 o/Makefile n/Makefile
! --- o/Makefile 2003-06-06 18:38:39.000000000 -0700
! +++ n/Makefile 2003-06-13 14:01:32.000000000 -0700
@@ -150,8 +150,13 @@
SUBDIRS += $(CLUSTERDIR)
--- 10980,10986 ----
static ctl_table vm_table[] = {
! diff -Nar -u4 orig/Makefile new/Makefile
! --- orig/Makefile 2003-06-06 18:38:39.000000000 -0700
! +++ new/Makefile 2003-08-19 14:54:50.000000000 -0700
@@ -150,8 +150,13 @@
SUBDIRS += $(CLUSTERDIR)
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines
at the same time. Free trial click here:http://www.vmware.com/wl/offer/358/0
|
