2 files changed, 15 insertions, 2 deletions

diff --git a/gnu/usr.bin/gdb/kgdb/kgdb.1 b/gnu/usr.bin/gdb/kgdb/kgdb.1
index 38a16953e0c3..1b7ffba6a687 100644
--- a/gnu/usr.bin/gdb/kgdb/kgdb.1
+++ b/gnu/usr.bin/gdb/kgdb/kgdb.1
@@ -31,6 +31,7 @@
 .Nd "kernel debugger"
 .Sh SYNOPSIS
 .Nm
+.Op Fl a
 .Op Fl v
 .Op Fl d Ar crashdir
 .Op Fl c Ar core | Fl n Ar dumpnr | Fl r Ar device
@@ -44,6 +45,15 @@ that allows debugging of kernel core files.
 .Pp
 The options are as follows:
 .Bl -tag -width ".Fl d Ar crashdir"
+.It Fl a
+Increase the annotation level.
+An annotation level of 1 features the historical
+.Fl fullname
+option of
+.Xr gdb 1 .
+This is useful when running
+.Nm
+in Emacs.
 .It Fl v
 Increase verbosity.
 .It Fl d Ar crashdir
diff --git a/gnu/usr.bin/gdb/kgdb/main.c b/gnu/usr.bin/gdb/kgdb/main.c
index 6e15053891c3..3ad158b731c0 100644
--- a/gnu/usr.bin/gdb/kgdb/main.c
+++ b/gnu/usr.bin/gdb/kgdb/main.c
@@ -82,7 +82,7 @@ usage(void)
 {
 
 	fprintf(stderr,
-	    "usage: %s [-v] [-d crashdir] [-c core | -n dumpnr | -r device]\n"
+	    "usage: %s [-a] [-v] [-d crashdir] [-c core | -n dumpnr | -r device]\n"
 	    "\t[kernel [core]]\n", getprogname());
 	exit(1);
 }
@@ -252,8 +252,11 @@ main(int argc, char *argv[])
 	if (s != NULL)
 		strlcpy(crashdir, s, sizeof(crashdir));
 
-	while ((ch = getopt(argc, argv, "c:d:n:r:v")) != -1) {
+	while ((ch = getopt(argc, argv, "ac:d:n:r:v")) != -1) {
 		switch (ch) {
+		case 'a':
+			annotation_level++;
+			break;
 		case 'c':	/* use given core file. */
 			if (vmcore != NULL) {
 				warnx("option %c: can only be specified once",