Commit d4dc3b24 authored Mar 28, 2016 by Linus Torvalds

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

Pull sparc fixes from David Miller:
 "Minor typing cleanup from Joe Perches, and some comment typo fixes
  from Adam Buchbinder"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Convert naked unsigned uses to unsigned int
  sparc: Fix misspellings in comments.

parents ec3c0737 9ef595d8

arch/sparc/include/asm/compat_signal.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -6,17 +6,17 @@

	#ifdef CONFIG_COMPAT		#ifdef CONFIG_COMPAT
	struct __new_sigaction32 {		struct __new_sigaction32 {
	unsigned sa_handler;		unsigned int sa_handler;
	unsigned int sa_flags;		unsigned int sa_flags;
	unsigned sa_restorer; /* not used by Linux/SPARC yet */		unsigned int sa_restorer; /* not used by Linux/SPARC yet */
	compat_sigset_t sa_mask;		compat_sigset_t sa_mask;
	};		};

	struct __old_sigaction32 {		struct __old_sigaction32 {
	unsigned sa_handler;		unsigned int sa_handler;
	compat_old_sigset_t sa_mask;		compat_old_sigset_t sa_mask;
	unsigned int sa_flags;		unsigned int sa_flags;
	unsigned sa_restorer; /* not used by Linux/SPARC yet */		unsigned int sa_restorer; /* not used by Linux/SPARC yet */
	};		};
	#endif		#endif

arch/sparc/include/asm/obio.h

+16 −16

Original line number	Original line	Diff line number	Diff line
	@@ -117,9 +117,9 @@ static inline void bw_clear_intr_mask(int sbus_level, int mask)
	"i" (ASI_M_CTL));		"i" (ASI_M_CTL));
	}		}

	static inline unsigned bw_get_prof_limit(int cpu)		static inline unsigned int bw_get_prof_limit(int cpu)
	{		{
	unsigned limit;		unsigned int limit;

	__asm__ __volatile__ ("lda [%1] %2, %0" :		__asm__ __volatile__ ("lda [%1] %2, %0" :
	"=r" (limit) :		"=r" (limit) :
	@@ -128,7 +128,7 @@ static inline unsigned bw_get_prof_limit(int cpu)
	return limit;		return limit;
	}		}

	static inline void bw_set_prof_limit(int cpu, unsigned limit)		static inline void bw_set_prof_limit(int cpu, unsigned int limit)
	{		{
	__asm__ __volatile__ ("sta %0, [%1] %2" : :		__asm__ __volatile__ ("sta %0, [%1] %2" : :
	"r" (limit),		"r" (limit),
	@@ -136,9 +136,9 @@ static inline void bw_set_prof_limit(int cpu, unsigned limit)
	"i" (ASI_M_CTL));		"i" (ASI_M_CTL));
	}		}

	static inline unsigned bw_get_ctrl(int cpu)		static inline unsigned int bw_get_ctrl(int cpu)
	{		{
	unsigned ctrl;		unsigned int ctrl;

	__asm__ __volatile__ ("lda [%1] %2, %0" :		__asm__ __volatile__ ("lda [%1] %2, %0" :
	"=r" (ctrl) :		"=r" (ctrl) :
	@@ -147,7 +147,7 @@ static inline unsigned bw_get_ctrl(int cpu)
	return ctrl;		return ctrl;
	}		}

	static inline void bw_set_ctrl(int cpu, unsigned ctrl)		static inline void bw_set_ctrl(int cpu, unsigned int ctrl)
	{		{
	__asm__ __volatile__ ("sta %0, [%1] %2" : :		__asm__ __volatile__ ("sta %0, [%1] %2" : :
	"r" (ctrl),		"r" (ctrl),
	@@ -155,9 +155,9 @@ static inline void bw_set_ctrl(int cpu, unsigned ctrl)
	"i" (ASI_M_CTL));		"i" (ASI_M_CTL));
	}		}

	static inline unsigned cc_get_ipen(void)		static inline unsigned int cc_get_ipen(void)
	{		{
	unsigned pending;		unsigned int pending;

	__asm__ __volatile__ ("lduha [%1] %2, %0" :		__asm__ __volatile__ ("lduha [%1] %2, %0" :
	"=r" (pending) :		"=r" (pending) :
	@@ -166,7 +166,7 @@ static inline unsigned cc_get_ipen(void)
	return pending;		return pending;
	}		}

	static inline void cc_set_iclr(unsigned clear)		static inline void cc_set_iclr(unsigned int clear)
	{		{
	__asm__ __volatile__ ("stha %0, [%1] %2" : :		__asm__ __volatile__ ("stha %0, [%1] %2" : :
	"r" (clear),		"r" (clear),
	@@ -174,9 +174,9 @@ static inline void cc_set_iclr(unsigned clear)
	"i" (ASI_M_MXCC));		"i" (ASI_M_MXCC));
	}		}

	static inline unsigned cc_get_imsk(void)		static inline unsigned int cc_get_imsk(void)
	{		{
	unsigned mask;		unsigned int mask;

	__asm__ __volatile__ ("lduha [%1] %2, %0" :		__asm__ __volatile__ ("lduha [%1] %2, %0" :
	"=r" (mask) :		"=r" (mask) :
	@@ -185,7 +185,7 @@ static inline unsigned cc_get_imsk(void)
	return mask;		return mask;
	}		}

	static inline void cc_set_imsk(unsigned mask)		static inline void cc_set_imsk(unsigned int mask)
	{		{
	__asm__ __volatile__ ("stha %0, [%1] %2" : :		__asm__ __volatile__ ("stha %0, [%1] %2" : :
	"r" (mask),		"r" (mask),
	@@ -193,9 +193,9 @@ static inline void cc_set_imsk(unsigned mask)
	"i" (ASI_M_MXCC));		"i" (ASI_M_MXCC));
	}		}

	static inline unsigned cc_get_imsk_other(int cpuid)		static inline unsigned int cc_get_imsk_other(int cpuid)
	{		{
	unsigned mask;		unsigned int mask;

	__asm__ __volatile__ ("lduha [%1] %2, %0" :		__asm__ __volatile__ ("lduha [%1] %2, %0" :
	"=r" (mask) :		"=r" (mask) :
	@@ -204,7 +204,7 @@ static inline unsigned cc_get_imsk_other(int cpuid)
	return mask;		return mask;
	}		}

	static inline void cc_set_imsk_other(int cpuid, unsigned mask)		static inline void cc_set_imsk_other(int cpuid, unsigned int mask)
	{		{
	__asm__ __volatile__ ("stha %0, [%1] %2" : :		__asm__ __volatile__ ("stha %0, [%1] %2" : :
	"r" (mask),		"r" (mask),
	@@ -212,7 +212,7 @@ static inline void cc_set_imsk_other(int cpuid, unsigned mask)
	"i" (ASI_M_CTL));		"i" (ASI_M_CTL));
	}		}

	static inline void cc_set_igen(unsigned gen)		static inline void cc_set_igen(unsigned int gen)
	{		{
	__asm__ __volatile__ ("sta %0, [%1] %2" : :		__asm__ __volatile__ ("sta %0, [%1] %2" : :
	"r" (gen),		"r" (gen),

arch/sparc/include/asm/openprom.h

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -29,12 +29,12 @@ struct linux_dev_v0_funcs {
	/* V2 and later prom device operations. */		/* V2 and later prom device operations. */
	struct linux_dev_v2_funcs {		struct linux_dev_v2_funcs {
	phandle (v2_inst2pkg)(int d); / Convert ihandle to phandle */		phandle (v2_inst2pkg)(int d); / Convert ihandle to phandle */
	char * (v2_dumb_mem_alloc)(char va, unsigned sz);		char * (v2_dumb_mem_alloc)(char va, unsigned int sz);
	void (v2_dumb_mem_free)(char va, unsigned sz);		void (v2_dumb_mem_free)(char va, unsigned int sz);

	/* To map devices into virtual I/O space. */		/* To map devices into virtual I/O space. */
	char * (v2_dumb_mmap)(char virta, int which_io, unsigned paddr, unsigned sz);		char * (v2_dumb_mmap)(char virta, int which_io, unsigned int paddr, unsigned int sz);
	void (v2_dumb_munmap)(char virta, unsigned size);		void (v2_dumb_munmap)(char virta, unsigned int size);

	int (v2_dev_open)(char devpath);		int (v2_dev_open)(char devpath);
	void (*v2_dev_close)(int d);		void (*v2_dev_close)(int d);
	@@ -50,7 +50,7 @@ struct linux_dev_v2_funcs {
	struct linux_mlist_v0 {		struct linux_mlist_v0 {
	struct linux_mlist_v0 *theres_more;		struct linux_mlist_v0 *theres_more;
	unsigned int start_adr;		unsigned int start_adr;
	unsigned num_bytes;		unsigned int num_bytes;
	};		};

	struct linux_mem_v0 {		struct linux_mem_v0 {

arch/sparc/include/asm/pgtable_64.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -218,7 +218,7 @@ extern pgprot_t PAGE_KERNEL_LOCKED;
	extern pgprot_t PAGE_COPY;		extern pgprot_t PAGE_COPY;
	extern pgprot_t PAGE_SHARED;		extern pgprot_t PAGE_SHARED;

	/* XXX This uglyness is for the atyfb driver's sparc mmap() support. XXX */		/* XXX This ugliness is for the atyfb driver's sparc mmap() support. XXX */
	extern unsigned long _PAGE_IE;		extern unsigned long _PAGE_IE;
	extern unsigned long _PAGE_E;		extern unsigned long _PAGE_E;
	extern unsigned long _PAGE_CACHE;		extern unsigned long _PAGE_CACHE;

arch/sparc/include/asm/processor_64.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -201,7 +201,7 @@ unsigned long get_wchan(struct task_struct *task);
	#define KSTK_ESP(tsk) (task_pt_regs(tsk)->u_regs[UREG_FP])		#define KSTK_ESP(tsk) (task_pt_regs(tsk)->u_regs[UREG_FP])

	/* Please see the commentary in asm/backoff.h for a description of		/* Please see the commentary in asm/backoff.h for a description of
	* what these instructions are doing and how they have been choosen.		* what these instructions are doing and how they have been chosen.
	* To make a long story short, we are trying to yield the current cpu		* To make a long story short, we are trying to yield the current cpu
	* strand during busy loops.		* strand during busy loops.
	*/		*/