Преглед на файлове

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
  kgdb: sparse fix
  kgdb: documentation update - remove kgdboe
Linus Torvalds преди 17 години
родител
ревизия
3b968b7c10
променени са 2 файла, в които са добавени 8 реда и са изтрити 15 реда
  1. 6 14
      Documentation/DocBook/kgdb.tmpl
  2. 2 1
      kernel/kgdb.c

+ 6 - 14
Documentation/DocBook/kgdb.tmpl

@@ -84,10 +84,9 @@
     runs an instance of gdb against the vmlinux file which contains
     runs an instance of gdb against the vmlinux file which contains
     the symbols (not boot image such as bzImage, zImage, uImage...).
     the symbols (not boot image such as bzImage, zImage, uImage...).
     In gdb the developer specifies the connection parameters and
     In gdb the developer specifies the connection parameters and
-    connects to kgdb.  Depending on which kgdb I/O modules exist in
-    the kernel for a given architecture, it may be possible to debug
-    the test machine's kernel with the development machine using a
-    rs232 or ethernet connection.
+    connects to kgdb.  The type of connection a developer makes with
+    gdb depends on the availability of kgdb I/O modules compiled as
+    builtin's or kernel modules in the test machine's kernel.
     </para>
     </para>
   </chapter>
   </chapter>
   <chapter id="CompilingAKernel">
   <chapter id="CompilingAKernel">
@@ -223,7 +222,7 @@
   </para>
   </para>
   <para>
   <para>
   IMPORTANT NOTE: Using this option with kgdb over the console
   IMPORTANT NOTE: Using this option with kgdb over the console
-  (kgdboc) or kgdb over ethernet (kgdboe) is not supported.
+  (kgdboc) is not supported.
   </para>
   </para>
   </sect1>
   </sect1>
   </chapter>
   </chapter>
@@ -249,18 +248,11 @@
     (gdb) target remote /dev/ttyS0
     (gdb) target remote /dev/ttyS0
     </programlisting>
     </programlisting>
     <para>
     <para>
-    Example (kgdb to a terminal server):
+    Example (kgdb to a terminal server on tcp port 2012):
     </para>
     </para>
     <programlisting>
     <programlisting>
     % gdb ./vmlinux
     % gdb ./vmlinux
-    (gdb) target remote udp:192.168.2.2:6443
-    </programlisting>
-    <para>
-    Example (kgdb over ethernet):
-    </para>
-    <programlisting>
-    % gdb ./vmlinux
-    (gdb) target remote udp:192.168.2.2:6443
+    (gdb) target remote 192.168.2.2:2012
     </programlisting>
     </programlisting>
     <para>
     <para>
     Once connected, you can debug a kernel the way you would debug an
     Once connected, you can debug a kernel the way you would debug an

+ 2 - 1
kernel/kgdb.c

@@ -1499,7 +1499,8 @@ int kgdb_nmicallback(int cpu, void *regs)
 	return 1;
 	return 1;
 }
 }
 
 
-void kgdb_console_write(struct console *co, const char *s, unsigned count)
+static void kgdb_console_write(struct console *co, const char *s,
+   unsigned count)
 {
 {
 	unsigned long flags;
 	unsigned long flags;