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

Commit c4222e46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next 

Pull sparc fixes from David Miller:
 "Sparc sparse fixes from Sam Ravnborg"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next: (67 commits)
  sparc64: fix sparse warnings in int_64.c
  sparc64: fix sparse warning in ftrace.c
  sparc64: fix sparse warning in kprobes.c
  sparc64: fix sparse warning in kgdb_64.c
  sparc64: fix sparse warnings in compat_audit.c
  sparc64: fix sparse warnings in init_64.c
  sparc64: fix sparse warnings in aes_glue.c
  sparc: fix sparse warnings in smp_32.c + smp_64.c
  sparc64: fix sparse warnings in perf_event.c
  sparc64: fix sparse warnings in kprobes.c
  sparc64: fix sparse warning in tsb.c
  sparc64: clean up compat_sigset_t.seta handling
  sparc64: fix sparse "Should it be static?" warnings in signal32.c
  sparc64: fix sparse warnings in sys_sparc32.c
  sparc64: fix sparse warning in pci.c
  sparc64: fix sparse warnings in smp_64.c
  sparc64: fix sparse warning in prom_64.c
  sparc64: fix sparse warning in btext.c
  sparc64: fix sparse warnings in sys_sparc_64.c + unaligned_64.c
  sparc64: fix sparse warning in process_64.c
  ...

Conflicts:
	arch/sparc/include/asm/pgtable_64.h
parents e99cfa2d 311b8935

arch/sparc/crypto/aes_glue.c

+3 −3
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ extern void aes_sparc64_ctr_crypt_256(const u64 *key, const u64 *input, 
				      u64 *output, unsigned int len,

				      u64 *iv);



struct aes_ops aes128_ops = {

static struct aes_ops aes128_ops = {

	.encrypt		= aes_sparc64_encrypt_128,

	.decrypt		= aes_sparc64_decrypt_128,

	.load_encrypt_keys	= aes_sparc64_load_encrypt_keys_128,
@@ -136,7 +136,7 @@ struct aes_ops aes128_ops = { 
	.ctr_crypt		= aes_sparc64_ctr_crypt_128,

};



struct aes_ops aes192_ops = {

static struct aes_ops aes192_ops = {

	.encrypt		= aes_sparc64_encrypt_192,

	.decrypt		= aes_sparc64_decrypt_192,

	.load_encrypt_keys	= aes_sparc64_load_encrypt_keys_192,
@@ -148,7 +148,7 @@ struct aes_ops aes192_ops = { 
	.ctr_crypt		= aes_sparc64_ctr_crypt_192,

};



struct aes_ops aes256_ops = {

static struct aes_ops aes256_ops = {

	.encrypt		= aes_sparc64_encrypt_256,

	.decrypt		= aes_sparc64_decrypt_256,

	.load_encrypt_keys	= aes_sparc64_load_encrypt_keys_256,

arch/sparc/include/asm/atomic_32.h

+4 −4
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ 


#define ATOMIC_INIT(i)  { (i) }



extern int __atomic_add_return(int, atomic_t *);

extern int atomic_cmpxchg(atomic_t *, int, int);

int __atomic_add_return(int, atomic_t *);

int atomic_cmpxchg(atomic_t *, int, int);

#define atomic_xchg(v, new) (xchg(&((v)->counter), new))

extern int __atomic_add_unless(atomic_t *, int, int);

extern void atomic_set(atomic_t *, int);

int __atomic_add_unless(atomic_t *, int, int);

void atomic_set(atomic_t *, int);



#define atomic_read(v)          (*(volatile int *)&(v)->counter)

arch/sparc/include/asm/atomic_64.h

+9 −9
Original line number Diff line number Diff line
@@ -20,15 +20,15 @@ 
#define atomic_set(v, i)	(((v)->counter) = i)

#define atomic64_set(v, i)	(((v)->counter) = i)



extern void atomic_add(int, atomic_t *);

extern void atomic64_add(long, atomic64_t *);

extern void atomic_sub(int, atomic_t *);

extern void atomic64_sub(long, atomic64_t *);

void atomic_add(int, atomic_t *);

void atomic64_add(long, atomic64_t *);

void atomic_sub(int, atomic_t *);

void atomic64_sub(long, atomic64_t *);



extern int atomic_add_ret(int, atomic_t *);

extern long atomic64_add_ret(long, atomic64_t *);

extern int atomic_sub_ret(int, atomic_t *);

extern long atomic64_sub_ret(long, atomic64_t *);

int atomic_add_ret(int, atomic_t *);

long atomic64_add_ret(long, atomic64_t *);

int atomic_sub_ret(int, atomic_t *);

long atomic64_sub_ret(long, atomic64_t *);



#define atomic_dec_return(v) atomic_sub_ret(1, v)

#define atomic64_dec_return(v) atomic64_sub_ret(1, v)
@@ -107,6 +107,6 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u) 


#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)



extern long atomic64_dec_if_positive(atomic64_t *v);

long atomic64_dec_if_positive(atomic64_t *v);



#endif /* !(__ARCH_SPARC64_ATOMIC__) */

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_32.h

+3 −3
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
 * NOTE: these routines are implementation dependent--

 * understand the hardware you are querying!

 */

extern void set_auxio(unsigned char bits_on, unsigned char bits_off);

extern unsigned char get_auxio(void); /* .../asm/floppy.h */

void set_auxio(unsigned char bits_on, unsigned char bits_off);

unsigned char get_auxio(void); /* .../asm/floppy.h */



/*

 * The following routines are provided for driver-compatibility
@@ -78,7 +78,7 @@ do { \ 




/* AUXIO2 (Power Off Control) */

extern __volatile__ unsigned char * auxio_power_register;

extern volatile u8 __iomem *auxio_power_register;



#define	AUXIO_POWER_DETECT_FAILURE	32

#define	AUXIO_POWER_CLEAR_FAILURE	2