Skip to content

Commit

Permalink
sparc32: fix sparse warnings in setup_32.c
Browse files Browse the repository at this point in the history
Fix following warnings:
setup_32.c:106:15: warning: symbol 'cmdline_memory_size' was not declared. Should it be static?
setup_32.c:270:16: warning: symbol 'fake_swapper_regs' was not declared. Should it be static?
setup_32.c:368:55: warning: Using plain integer as NULL pointer

Add missing declaration of cmdline_memory_size and remove the local one in init_32.c
fake_swapper_regs was only used locally - so defined static.
When replacing 0 with NULL also add a few spaces around operators

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sam Ravnborg authored and David S. Miller committed Apr 29, 2014
1 parent c31f765 commit d191723
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions arch/sparc/include/asm/setup.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ extern unsigned long pdma_areasize;

int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler);

/* setup_32.c */
extern unsigned long cmdline_memory_size;

#endif

extern void sun_do_break(void);
Expand Down
4 changes: 2 additions & 2 deletions arch/sparc/kernel/setup_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ static __init void leon_patch(void)
}

struct tt_entry *sparc_ttable;
struct pt_regs fake_swapper_regs;
static struct pt_regs fake_swapper_regs;

/* Called from head_32.S - before we have setup anything
* in the kernel. Be very careful with what you do here.
Expand Down Expand Up @@ -365,7 +365,7 @@ void __init setup_arch(char **cmdline_p)

prom_setsync(prom_sync_me);

if((boot_flags&BOOTME_DEBUG) && (linux_dbvec!=0) &&
if((boot_flags & BOOTME_DEBUG) && (linux_dbvec != NULL) &&
((*(short *)linux_dbvec) != -1)) {
printk("Booted under KADB. Syncing trap table.\n");
(*(linux_dbvec->teach_debugger))();
Expand Down
2 changes: 1 addition & 1 deletion arch/sparc/mm/init_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <asm/pgtable.h>
#include <asm/vaddrs.h>
#include <asm/pgalloc.h> /* bug in asm-generic/tlb.h: check_pgt_cache */
#include <asm/setup.h>
#include <asm/tlb.h>
#include <asm/prom.h>
#include <asm/leon.h>
Expand Down Expand Up @@ -65,7 +66,6 @@ void show_mem(unsigned int filter)
}


extern unsigned long cmdline_memory_size;
unsigned long last_valid_pfn;

unsigned long calc_highpages(void)
Expand Down

0 comments on commit d191723

Please sign in to comment.