Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81d44507 authored by Jason Wessel's avatar Jason Wessel
Browse files

vt,console,kdb: automatically set kdb LINES variable 



The kernel console interface stores the number of lines it is
configured to use. The kdb debugger can greatly benefit by knowing how
many lines there are on the console for the pager functionality
without having the end user compile in the setting or have to
repeatedly change it at run time.

Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
CC: David Airlie <airlied@linux.ie>
CC: Andrew Morton <akpm@linux-foundation.org>
parent b45cfba4

drivers/char/vt.c

+17 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ 
#include <linux/io.h>

#include <asm/system.h>

#include <linux/uaccess.h>

#include <linux/kdb.h>



#define MAX_NR_CON_DRIVER 16
@@ -3442,6 +3443,22 @@ int con_debug_enter(struct vc_data *vc) 
	console_blanked = 0;

	if (vc->vc_sw->con_debug_enter)

		ret = vc->vc_sw->con_debug_enter(vc);

#ifdef CONFIG_KGDB_KDB

	/* Set the initial LINES variable if it is not already set */

	if (vc->vc_rows < 999) {

		int linecount;

		char lns[4];

		const char *setargs[3] = {

			"set",

			"LINES",

			lns,

		};

		if (kdbgetintenv(setargs[0], &linecount)) {

			snprintf(lns, 4, "%i", vc->vc_rows);

			kdb_set(2, setargs);

		}

	}

#endif /* CONFIG_KGDB_KDB */

	return ret;

}

EXPORT_SYMBOL_GPL(con_debug_enter);

include/linux/kdb.h

+4 −0
Original line number Diff line number Diff line
@@ -114,4 +114,8 @@ enum { 
	KDB_INIT_EARLY,

	KDB_INIT_FULL,

};



extern int kdbgetintenv(const char *, int *);

extern int kdb_set(int, const char **);



#endif	/* !_KDB_H */

kernel/debug/kdb/kdb_private.h

+0 −2
Original line number Diff line number Diff line
@@ -144,9 +144,7 @@ extern int kdb_getword(unsigned long *, unsigned long, size_t); 
extern int kdb_putword(unsigned long, unsigned long, size_t);



extern int kdbgetularg(const char *, unsigned long *);

extern int kdb_set(int, const char **);

extern char *kdbgetenv(const char *);

extern int kdbgetintenv(const char *, int *);

extern int kdbgetaddrarg(int, const char **, int*, unsigned long *,

			 long *, char **);

extern int kdbgetsymval(const char *, kdb_symtab_t *);