summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/setup_32.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-04-29 01:12:34 -0400
committerDavid S. Miller <davem@davemloft.net>2014-04-29 01:12:34 -0400
commit8cf749a8f506b06ebbf090709d64e81af519184b (patch)
tree60a8018b846b55899be18adf0592adc10f7d4367 /arch/sparc/kernel/setup_32.c
parent2aafe1a4d451866e3e7b476e2fa0813b69b313c1 (diff)
parent1bbc90607762de736f58d48714710735c0c34848 (diff)
downloadtalos-op-linux-8cf749a8f506b06ebbf090709d64e81af519184b.tar.gz
talos-op-linux-8cf749a8f506b06ebbf090709d64e81af519184b.zip
Merge branch 'sparc32-sparse'
Sam Ravnborg says: ==================== sparse warning fixes in arch/sparc/ The following patch-set address a lot of sparse warnings in the sparc32 specific parts of arch/sparc/. A few sparc64 bits are touched too when code are shared. Within arch/sparc/mm/ only two warnings remains. These are related to the return value of of_ioremap() which is __iomem. Within arch/sparc/kernel/ only three files now produces sparse warnings: sys_sparc_32.c time_32.c auxio_32.c The fixes was not obvious so the warnings was left for now. When looking at tadpole.c I was left with the impression that most of the code was actually unused - but for now I added a "TODO". This is made on top of 3.15-rc2. This set replaces the two sets sent the last days. V2: - Do not add extern in front of prototypes. - Tidy up a few changelongs There are still sparse warnings left that are easy to address. But this fixes the majority. ====================
Diffstat (limited to 'arch/sparc/kernel/setup_32.c')
-rw-r--r--arch/sparc/kernel/setup_32.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c
index 1434526970a6..baef495c06bd 100644
--- a/arch/sparc/kernel/setup_32.c
+++ b/arch/sparc/kernel/setup_32.c
@@ -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.
@@ -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))();
OpenPOWER on IntegriCloud