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.
This commit is contained in:
Linus Torvalds 2016-03-28 15:14:11 -05:00
commit d4dc3b2442
23 changed files with 68 additions and 68 deletions

View File

@ -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

View File

@ -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),

View File

@ -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 {

View File

@ -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;

View File

@ -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.
*/ */

View File

@ -25,7 +25,7 @@ struct sigcontext32 {
int sigc_oswins; /* outstanding windows */ int sigc_oswins; /* outstanding windows */
/* stack ptrs for each regwin buf */ /* stack ptrs for each regwin buf */
unsigned sigc_spbuf[__SUNOS_MAXWIN]; unsigned int sigc_spbuf[__SUNOS_MAXWIN];
/* Windows to restore after signal */ /* Windows to restore after signal */
struct reg_window32 sigc_wbuf[__SUNOS_MAXWIN]; struct reg_window32 sigc_wbuf[__SUNOS_MAXWIN];

View File

@ -149,7 +149,7 @@ extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end;
* page size in question. So for PMD mappings (which fall on * page size in question. So for PMD mappings (which fall on
* bit 23, for 8MB per PMD) we must propagate bit 22 for a * bit 23, for 8MB per PMD) we must propagate bit 22 for a
* 4MB huge page. For huge PUDs (which fall on bit 33, for * 4MB huge page. For huge PUDs (which fall on bit 33, for
* 8GB per PUD), we have to accomodate 256MB and 2GB huge * 8GB per PUD), we have to accommodate 256MB and 2GB huge
* pages. So for those we propagate bits 32 to 28. * pages. So for those we propagate bits 32 to 28.
*/ */
#define KERN_PGTABLE_WALK(VADDR, REG1, REG2, FAIL_LABEL) \ #define KERN_PGTABLE_WALK(VADDR, REG1, REG2, FAIL_LABEL) \

View File

@ -6,13 +6,13 @@
#if defined(__sparc__) && defined(__arch64__) #if defined(__sparc__) && defined(__arch64__)
/* 64 bit sparc */ /* 64 bit sparc */
struct stat { struct stat {
unsigned st_dev; unsigned int st_dev;
ino_t st_ino; ino_t st_ino;
mode_t st_mode; mode_t st_mode;
short st_nlink; short st_nlink;
uid_t st_uid; uid_t st_uid;
gid_t st_gid; gid_t st_gid;
unsigned st_rdev; unsigned int st_rdev;
off_t st_size; off_t st_size;
time_t st_atime; time_t st_atime;
time_t st_mtime; time_t st_mtime;

View File

@ -5,27 +5,27 @@
#include "kernel.h" #include "kernel.h"
static unsigned dir_class[] = { static unsigned int dir_class[] = {
#include <asm-generic/audit_dir_write.h> #include <asm-generic/audit_dir_write.h>
~0U ~0U
}; };
static unsigned read_class[] = { static unsigned int read_class[] = {
#include <asm-generic/audit_read.h> #include <asm-generic/audit_read.h>
~0U ~0U
}; };
static unsigned write_class[] = { static unsigned int write_class[] = {
#include <asm-generic/audit_write.h> #include <asm-generic/audit_write.h>
~0U ~0U
}; };
static unsigned chattr_class[] = { static unsigned int chattr_class[] = {
#include <asm-generic/audit_change_attr.h> #include <asm-generic/audit_change_attr.h>
~0U ~0U
}; };
static unsigned signal_class[] = { static unsigned int signal_class[] = {
#include <asm-generic/audit_signal.h> #include <asm-generic/audit_signal.h>
~0U ~0U
}; };
@ -39,7 +39,7 @@ int audit_classify_arch(int arch)
return 0; return 0;
} }
int audit_classify_syscall(int abi, unsigned syscall) int audit_classify_syscall(int abi, unsigned int syscall)
{ {
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
if (abi == AUDIT_ARCH_SPARC) if (abi == AUDIT_ARCH_SPARC)

View File

@ -2,32 +2,32 @@
#include <asm/unistd.h> #include <asm/unistd.h>
#include "kernel.h" #include "kernel.h"
unsigned sparc32_dir_class[] = { unsigned int sparc32_dir_class[] = {
#include <asm-generic/audit_dir_write.h> #include <asm-generic/audit_dir_write.h>
~0U ~0U
}; };
unsigned sparc32_chattr_class[] = { unsigned int sparc32_chattr_class[] = {
#include <asm-generic/audit_change_attr.h> #include <asm-generic/audit_change_attr.h>
~0U ~0U
}; };
unsigned sparc32_write_class[] = { unsigned int sparc32_write_class[] = {
#include <asm-generic/audit_write.h> #include <asm-generic/audit_write.h>
~0U ~0U
}; };
unsigned sparc32_read_class[] = { unsigned int sparc32_read_class[] = {
#include <asm-generic/audit_read.h> #include <asm-generic/audit_read.h>
~0U ~0U
}; };
unsigned sparc32_signal_class[] = { unsigned int sparc32_signal_class[] = {
#include <asm-generic/audit_signal.h> #include <asm-generic/audit_signal.h>
~0U ~0U
}; };
int sparc32_classify_syscall(unsigned syscall) int sparc32_classify_syscall(unsigned int syscall)
{ {
switch(syscall) { switch(syscall) {
case __NR_open: case __NR_open:

View File

@ -1255,7 +1255,7 @@ flush_patch_exception:
kuw_patch1_7win: sll %o3, 6, %o3 kuw_patch1_7win: sll %o3, 6, %o3
/* No matter how much overhead this routine has in the worst /* No matter how much overhead this routine has in the worst
* case scenerio, it is several times better than taking the * case scenario, it is several times better than taking the
* traps with the old method of just doing flush_user_windows(). * traps with the old method of just doing flush_user_windows().
*/ */
kill_user_windows: kill_user_windows:

View File

@ -131,7 +131,7 @@ void __iomem *ioremap(unsigned long offset, unsigned long size)
EXPORT_SYMBOL(ioremap); EXPORT_SYMBOL(ioremap);
/* /*
* Comlimentary to ioremap(). * Complementary to ioremap().
*/ */
void iounmap(volatile void __iomem *virtual) void iounmap(volatile void __iomem *virtual)
{ {
@ -233,7 +233,7 @@ _sparc_ioremap(struct resource *res, u32 bus, u32 pa, int sz)
} }
/* /*
* Comlimentary to _sparc_ioremap(). * Complementary to _sparc_ioremap().
*/ */
static void _sparc_free_io(struct resource *res) static void _sparc_free_io(struct resource *res)
{ {
@ -532,7 +532,7 @@ static void pci32_unmap_page(struct device *dev, dma_addr_t ba, size_t size,
} }
/* Map a set of buffers described by scatterlist in streaming /* Map a set of buffers described by scatterlist in streaming
* mode for DMA. This is the scather-gather version of the * mode for DMA. This is the scatter-gather version of the
* above pci_map_single interface. Here the scatter gather list * above pci_map_single interface. Here the scatter gather list
* elements are each tagged with the appropriate dma address * elements are each tagged with the appropriate dma address
* and length. They are obtained via sg_dma_{address,length}(SG). * and length. They are obtained via sg_dma_{address,length}(SG).

View File

@ -54,12 +54,12 @@ void do_signal32(struct pt_regs * regs);
asmlinkage int do_sys32_sigstack(u32 u_ssptr, u32 u_ossptr, unsigned long sp); asmlinkage int do_sys32_sigstack(u32 u_ssptr, u32 u_ossptr, unsigned long sp);
/* compat_audit.c */ /* compat_audit.c */
extern unsigned sparc32_dir_class[]; extern unsigned int sparc32_dir_class[];
extern unsigned sparc32_chattr_class[]; extern unsigned int sparc32_chattr_class[];
extern unsigned sparc32_write_class[]; extern unsigned int sparc32_write_class[];
extern unsigned sparc32_read_class[]; extern unsigned int sparc32_read_class[];
extern unsigned sparc32_signal_class[]; extern unsigned int sparc32_signal_class[];
int sparc32_classify_syscall(unsigned syscall); int sparc32_classify_syscall(unsigned int syscall);
#endif #endif
#ifdef CONFIG_SPARC32 #ifdef CONFIG_SPARC32

View File

@ -203,7 +203,7 @@ static struct irq_chip leon_irq = {
/* /*
* Build a LEON IRQ for the edge triggered LEON IRQ controller: * Build a LEON IRQ for the edge triggered LEON IRQ controller:
* Edge (normal) IRQ - handle_simple_irq, ack=DONT-CARE, never ack * Edge (normal) IRQ - handle_simple_irq, ack=DON'T-CARE, never ack
* Level IRQ (PCI|Level-GPIO) - handle_fasteoi_irq, ack=1, ack after ISR * Level IRQ (PCI|Level-GPIO) - handle_fasteoi_irq, ack=1, ack after ISR
* Per-CPU Edge - handle_percpu_irq, ack=0 * Per-CPU Edge - handle_percpu_irq, ack=0
*/ */

View File

@ -103,7 +103,7 @@ static void show_regwindow32(struct pt_regs *regs)
mm_segment_t old_fs; mm_segment_t old_fs;
__asm__ __volatile__ ("flushw"); __asm__ __volatile__ ("flushw");
rw = compat_ptr((unsigned)regs->u_regs[14]); rw = compat_ptr((unsigned int)regs->u_regs[14]);
old_fs = get_fs(); old_fs = get_fs();
set_fs (USER_DS); set_fs (USER_DS);
if (copy_from_user (&r_w, rw, sizeof(r_w))) { if (copy_from_user (&r_w, rw, sizeof(r_w))) {

View File

@ -109,7 +109,7 @@ unsigned long cmdline_memory_size __initdata = 0;
unsigned char boot_cpu_id = 0xff; /* 0xff will make it into DATA section... */ unsigned char boot_cpu_id = 0xff; /* 0xff will make it into DATA section... */
static void static void
prom_console_write(struct console *con, const char *s, unsigned n) prom_console_write(struct console *con, const char *s, unsigned int n)
{ {
prom_write(s, n); prom_write(s, n);
} }

View File

@ -77,7 +77,7 @@ struct screen_info screen_info = {
}; };
static void static void
prom_console_write(struct console *con, const char *s, unsigned n) prom_console_write(struct console *con, const char *s, unsigned int n)
{ {
prom_write(s, n); prom_write(s, n);
} }

View File

@ -144,7 +144,7 @@ void do_sigreturn32(struct pt_regs *regs)
compat_uptr_t fpu_save; compat_uptr_t fpu_save;
compat_uptr_t rwin_save; compat_uptr_t rwin_save;
unsigned int psr; unsigned int psr;
unsigned pc, npc; unsigned int pc, npc;
sigset_t set; sigset_t set;
compat_sigset_t seta; compat_sigset_t seta;
int err, i; int err, i;

View File

@ -337,10 +337,10 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, second
switch (call) { switch (call) {
case SEMOP: case SEMOP:
err = sys_semtimedop(first, ptr, err = sys_semtimedop(first, ptr,
(unsigned)second, NULL); (unsigned int)second, NULL);
goto out; goto out;
case SEMTIMEDOP: case SEMTIMEDOP:
err = sys_semtimedop(first, ptr, (unsigned)second, err = sys_semtimedop(first, ptr, (unsigned int)second,
(const struct timespec __user *) (const struct timespec __user *)
(unsigned long) fifth); (unsigned long) fifth);
goto out; goto out;

View File

@ -1,4 +1,4 @@
/* sysfs.c: Toplogy sysfs support code for sparc64. /* sysfs.c: Topology sysfs support code for sparc64.
* *
* Copyright (C) 2007 David S. Miller <davem@davemloft.net> * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
*/ */

View File

@ -209,8 +209,8 @@ static inline int do_int_store(int reg_num, int size, unsigned long *dst_addr,
if (size == 16) { if (size == 16) {
size = 8; size = 8;
zero = (((long)(reg_num ? zero = (((long)(reg_num ?
(unsigned)fetch_reg(reg_num, regs) : 0)) << 32) | (unsigned int)fetch_reg(reg_num, regs) : 0)) << 32) |
(unsigned)fetch_reg(reg_num + 1, regs); (unsigned int)fetch_reg(reg_num + 1, regs);
} else if (reg_num) { } else if (reg_num) {
src_val_p = fetch_reg_addr(reg_num, regs); src_val_p = fetch_reg_addr(reg_num, regs);
} }

View File

@ -303,10 +303,10 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
fixup = search_extables_range(regs->pc, &g2); fixup = search_extables_range(regs->pc, &g2);
/* Values below 10 are reserved for other things */ /* Values below 10 are reserved for other things */
if (fixup > 10) { if (fixup > 10) {
extern const unsigned __memset_start[]; extern const unsigned int __memset_start[];
extern const unsigned __memset_end[]; extern const unsigned int __memset_end[];
extern const unsigned __csum_partial_copy_start[]; extern const unsigned int __csum_partial_copy_start[];
extern const unsigned __csum_partial_copy_end[]; extern const unsigned int __csum_partial_copy_end[];
#ifdef DEBUG_EXCEPTIONS #ifdef DEBUG_EXCEPTIONS
printk("Exception: PC<%08lx> faddr<%08lx>\n", printk("Exception: PC<%08lx> faddr<%08lx>\n",

View File

@ -351,7 +351,7 @@ do { *prog++ = BR_OPC | WDISP22(OFF); \
* *
* Sometimes we need to emit a branch earlier in the code * Sometimes we need to emit a branch earlier in the code
* sequence. And in these situations we adjust "destination" * sequence. And in these situations we adjust "destination"
* to accomodate this difference. For example, if we needed * to accommodate this difference. For example, if we needed
* to emit a branch (and it's delay slot) right before the * to emit a branch (and it's delay slot) right before the
* final instruction emitted for a BPF opcode, we'd use * final instruction emitted for a BPF opcode, we'd use
* "destination + 4" instead of just plain "destination" above. * "destination + 4" instead of just plain "destination" above.