Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cf749a8 authored by David S. Miller's avatar David S. Miller
Browse files

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.
====================
parents 2aafe1a4 1bbc9060

arch/sparc/include/asm/auxio.h

+7 −0
Original line number Diff line number Diff line 
#ifndef ___ASM_SPARC_AUXIO_H

#define ___ASM_SPARC_AUXIO_H



#ifndef __ASSEMBLY__



extern void __iomem *auxio_register;



#endif /* ifndef __ASSEMBLY__ */



#if defined(__sparc__) && defined(__arch64__)

#include <asm/auxio_64.h>

#else

arch/sparc/include/asm/auxio_64.h

+0 −2
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ 


#ifndef __ASSEMBLY__



extern void __iomem *auxio_register;



#define AUXIO_LTE_ON	1

#define AUXIO_LTE_OFF	0

arch/sparc/include/asm/bug.h

+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ extern void do_BUG(const char *file, int line); 
#include <asm-generic/bug.h>



struct pt_regs;

extern void die_if_kernel(char *str, struct pt_regs *regs) __attribute__ ((noreturn));

void __noreturn die_if_kernel(char *str, struct pt_regs *regs);



#endif

arch/sparc/include/asm/cpudata.h

+10 −0
Original line number Diff line number Diff line 
#ifndef ___ASM_SPARC_CPUDATA_H

#define ___ASM_SPARC_CPUDATA_H



#ifndef __ASSEMBLY__



#include <linux/threads.h>

#include <linux/percpu.h>



extern const struct seq_operations cpuinfo_op;



#endif /* !(__ASSEMBLY__) */



#if defined(__sparc__) && defined(__arch64__)

#include <asm/cpudata_64.h>

#else

arch/sparc/include/asm/cpudata_64.h

+0 −5
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ 


#ifndef __ASSEMBLY__



#include <linux/percpu.h>

#include <linux/threads.h>



typedef struct {

	/* Dcache line 1 */

	unsigned int	__softirq_pending; /* must be 1st, see rtrap.S */
@@ -35,8 +32,6 @@ DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data); 
#define cpu_data(__cpu)		per_cpu(__cpu_data, (__cpu))

#define local_cpu_data()	__get_cpu_var(__cpu_data)



extern const struct seq_operations cpuinfo_op;



#endif /* !(__ASSEMBLY__) */



#include <asm/trap_block.h>