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:
vt,console,kdb: preserve console_blanked while in kdb
vt: fix regression warnings from KMS merge
arm,kgdb: fix GDB_MAX_REGS no longer used
kgdb: add missing __percpu markup in arch/x86/kernel/kgdb.c
kdb: fix compile error without CONFIG_KALLSYMS

+17 -7
+1 -1
arch/x86/kernel/kgdb.c
··· 194 194 unsigned long addr; 195 195 int len; 196 196 int type; 197 - struct perf_event **pev; 197 + struct perf_event * __percpu *pev; 198 198 } breakinfo[HBP_NUM]; 199 199 200 200 static unsigned long early_dr7;
+7 -4
drivers/char/vt.c
··· 194 194 int fg_console; 195 195 int last_console; 196 196 int want_console = -1; 197 - int saved_fg_console; 198 - int saved_last_console; 199 - int saved_want_console; 200 - int saved_vc_mode; 197 + static int saved_fg_console; 198 + static int saved_last_console; 199 + static int saved_want_console; 200 + static int saved_vc_mode; 201 + static int saved_console_blanked; 201 202 202 203 /* 203 204 * For each existing display, we have a pointer to console currently visible ··· 3450 3449 saved_last_console = last_console; 3451 3450 saved_want_console = want_console; 3452 3451 saved_vc_mode = vc->vc_mode; 3452 + saved_console_blanked = console_blanked; 3453 3453 vc->vc_mode = KD_TEXT; 3454 3454 console_blanked = 0; 3455 3455 if (vc->vc_sw->con_debug_enter) ··· 3494 3492 fg_console = saved_fg_console; 3495 3493 last_console = saved_last_console; 3496 3494 want_console = saved_want_console; 3495 + console_blanked = saved_console_blanked; 3497 3496 vc_cons[fg_console].d->vc_mode = saved_vc_mode; 3498 3497 3499 3498 vc = vc_cons[fg_console].d;
+7
kernel/debug/kdb/kdb_private.h
··· 255 255 extern void kdb_print_nameval(const char *name, unsigned long val); 256 256 extern void kdb_send_sig_info(struct task_struct *p, struct siginfo *info); 257 257 extern void kdb_meminfo_proc_show(void); 258 + #ifdef CONFIG_KALLSYMS 258 259 extern const char *kdb_walk_kallsyms(loff_t *pos); 260 + #else /* ! CONFIG_KALLSYMS */ 261 + static inline const char *kdb_walk_kallsyms(loff_t *pos) 262 + { 263 + return NULL; 264 + } 265 + #endif /* ! CONFIG_KALLSYMS */ 259 266 extern char *kdb_getstr(char *, size_t, char *); 260 267 261 268 /* Defines for kdb_symbol_print */
+2 -2
kernel/debug/kdb/kdb_support.c
··· 82 82 int kdbnearsym(unsigned long addr, kdb_symtab_t *symtab) 83 83 { 84 84 int ret = 0; 85 - unsigned long symbolsize; 86 - unsigned long offset; 85 + unsigned long symbolsize = 0; 86 + unsigned long offset = 0; 87 87 #define knt1_size 128 /* must be >= kallsyms table size */ 88 88 char *knt1 = NULL; 89 89