Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sh: Fix up kgdb build with modular sh-sci.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

+9 -2
+1 -1
arch/sh/Kconfig.debug
··· 124 124 125 125 config SH_KGDB_CONSOLE 126 126 bool "Console messages through GDB" 127 - depends on !SERIAL_SH_SCI_CONSOLE 127 + depends on !SERIAL_SH_SCI_CONSOLE && SERIAL_SH_SCI=y 128 128 select SERIAL_CORE_CONSOLE 129 129 default n 130 130
+8 -1
arch/sh/kernel/kgdb_stub.c
··· 102 102 #include <linux/init.h> 103 103 #include <linux/console.h> 104 104 #include <linux/sysrq.h> 105 + #include <linux/module.h> 105 106 #include <asm/system.h> 106 107 #include <asm/cacheflush.h> 107 108 #include <asm/current.h> ··· 117 116 kgdb_bus_error_hook_t *kgdb_bus_err_hook; 118 117 119 118 int (*kgdb_getchar)(void); 119 + EXPORT_SYMBOL_GPL(kgdb_getchar); 120 120 void (*kgdb_putchar)(int); 121 + EXPORT_SYMBOL_GPL(kgdb_putchar); 121 122 122 123 static void put_debug_char(int c) 123 124 { ··· 139 136 #define NUMREGBYTES (MAXREG*4) 140 137 #define OUTBUFMAX (NUMREGBYTES*2+512) 141 138 142 - enum regs { 139 + enum { 143 140 R0 = 0, R1, R2, R3, R4, R5, R6, R7, 144 141 R8, R9, R10, R11, R12, R13, R14, R15, 145 142 PC, PR, GBR, VBR, MACH, MACL, SR, ··· 179 176 180 177 /* SCI/UART settings, used in kgdb_console_setup() */ 181 178 int kgdb_portnum = CONFIG_KGDB_DEFPORT; 179 + EXPORT_SYMBOL_GPL(kgdb_portnum); 182 180 int kgdb_baud = CONFIG_KGDB_DEFBAUD; 181 + EXPORT_SYMBOL_GPL(kgdb_baud); 183 182 char kgdb_parity = CONFIG_KGDB_DEFPARITY; 183 + EXPORT_SYMBOL_GPL(kgdb_parity); 184 184 char kgdb_bits = CONFIG_KGDB_DEFBITS; 185 + EXPORT_SYMBOL_GPL(kgdb_bits); 185 186 186 187 /* Jump buffer for setjmp/longjmp */ 187 188 static jmp_buf rem_com_env;