Commit 91b152aa authored by Jason Wessel's avatar Jason Wessel
Browse files

kdb,kgdb: fix sparse fixups 



Fix the following sparse warnings:

kdb_main.c:328:5: warning: symbol 'kdbgetu64arg' was not declared. Should it be static?
kgdboc.c:246:12: warning: symbol 'kgdboc_early_init' was not declared. Should it be static?
kgdb.c:652:26: warning: incorrect type in argument 1 (different address spaces)
kgdb.c:652:26:    expected void const *ptr
kgdb.c:652:26:    got struct perf_event *[noderef] <asn:3>*pev

The one in kgdb.c required the (void * __force) because of the return
code from register_wide_hw_breakpoint looking like:

        return (void __percpu __force *)ERR_PTR(err);

Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
parent 75d14ede

arch/x86/kernel/kgdb.c

+1 −1
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ void kgdb_arch_late(void) 
		if (breakinfo[i].pev)

			continue;

		breakinfo[i].pev = register_wide_hw_breakpoint(&attr, NULL);

		if (IS_ERR(breakinfo[i].pev)) {

		if (IS_ERR((void * __force)breakinfo[i].pev)) {

			printk(KERN_ERR "kgdb: Could not allocate hw"

			       "breakpoints\nDisabling the kernel debugger\n");

			breakinfo[i].pev = NULL;

drivers/serial/kgdboc.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static struct kgdb_io kgdboc_io_ops = { 


#ifdef CONFIG_KGDB_SERIAL_CONSOLE

/* This is only available if kgdboc is a built in for early debugging */

int __init kgdboc_early_init(char *opt)

static int __init kgdboc_early_init(char *opt)

{

	/* save the first character of the config string because the

	 * init routine can destroy it.

include/linux/kdb.h

+8 −0
Original line number Diff line number Diff line
@@ -139,6 +139,14 @@ int kdb_process_cpu(const struct task_struct *p) 


/* kdb access to register set for stack dumping */

extern struct pt_regs *kdb_current_regs;

#ifdef CONFIG_KALLSYMS

extern const char *kdb_walk_kallsyms(loff_t *pos);

#else /* ! CONFIG_KALLSYMS */

static inline const char *kdb_walk_kallsyms(loff_t *pos)

{

	return NULL;

}

#endif /* ! CONFIG_KALLSYMS */



/* Dynamic kdb shell command registration */

extern int kdb_register(char *, kdb_func_t, char *, char *, short);

kernel/debug/kdb/kdb_private.h

+1 −8
Original line number Diff line number Diff line
@@ -105,6 +105,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 kdbgetu64arg(const char *, u64 *);

extern char *kdbgetenv(const char *);

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

			 long *, char **);
@@ -216,14 +217,6 @@ extern void kdb_ps1(const struct task_struct *p); 
extern void kdb_print_nameval(const char *name, unsigned long val);

extern void kdb_send_sig_info(struct task_struct *p, struct siginfo *info);

extern void kdb_meminfo_proc_show(void);

#ifdef CONFIG_KALLSYMS

extern const char *kdb_walk_kallsyms(loff_t *pos);

#else /* ! CONFIG_KALLSYMS */

static inline const char *kdb_walk_kallsyms(loff_t *pos)

{

	return NULL;

}

#endif /* ! CONFIG_KALLSYMS */

extern char *kdb_getstr(char *, size_t, char *);



/* Defines for kdb_symbol_print */

CRA Git | Maintained and supported by SUSTech CRA and CCSE