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

+8 -15
+6 -14
Documentation/DocBook/kgdb.tmpl
··· 84 84 runs an instance of gdb against the vmlinux file which contains 85 85 the symbols (not boot image such as bzImage, zImage, uImage...). 86 86 In gdb the developer specifies the connection parameters and 87 - connects to kgdb. Depending on which kgdb I/O modules exist in 88 - the kernel for a given architecture, it may be possible to debug 89 - the test machine's kernel with the development machine using a 90 - rs232 or ethernet connection. 87 + connects to kgdb. The type of connection a developer makes with 88 + gdb depends on the availability of kgdb I/O modules compiled as 89 + builtin's or kernel modules in the test machine's kernel. 91 90 </para> 92 91 </chapter> 93 92 <chapter id="CompilingAKernel"> ··· 222 223 </para> 223 224 <para> 224 225 IMPORTANT NOTE: Using this option with kgdb over the console 225 - (kgdboc) or kgdb over ethernet (kgdboe) is not supported. 226 + (kgdboc) is not supported. 226 227 </para> 227 228 </sect1> 228 229 </chapter> ··· 248 249 (gdb) target remote /dev/ttyS0 249 250 </programlisting> 250 251 <para> 251 - Example (kgdb to a terminal server): 252 + Example (kgdb to a terminal server on tcp port 2012): 252 253 </para> 253 254 <programlisting> 254 255 % gdb ./vmlinux 255 - (gdb) target remote udp:192.168.2.2:6443 256 - </programlisting> 257 - <para> 258 - Example (kgdb over ethernet): 259 - </para> 260 - <programlisting> 261 - % gdb ./vmlinux 262 - (gdb) target remote udp:192.168.2.2:6443 256 + (gdb) target remote 192.168.2.2:2012 263 257 </programlisting> 264 258 <para> 265 259 Once connected, you can debug a kernel the way you would debug an
+2 -1
kernel/kgdb.c
··· 1499 1499 return 1; 1500 1500 } 1501 1501 1502 - void kgdb_console_write(struct console *co, const char *s, unsigned count) 1502 + static void kgdb_console_write(struct console *co, const char *s, 1503 + unsigned count) 1503 1504 { 1504 1505 unsigned long flags; 1505 1506