xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent ec3c07377b 9ef595d83a
commit d4dc3b2442
23 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/sparc/kernel/audit.c
View File

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

12
arch/sparc/kernel/compat_audit.c
View File

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

2
arch/sparc/kernel/entry.S
View File

@@ -1255,7 +1255,7 @@ flush_patch_exception:
kuw_patch1_7win: sll %o3, 6, %o3
/* 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().
*/
kill_user_windows:

6
arch/sparc/kernel/ioport.c
View File

@@ -131,7 +131,7 @@ void __iomem *ioremap(unsigned long offset, unsigned long size)
EXPORT_SYMBOL(ioremap);
/*
* Comlimentary to ioremap().
* Complementary to ioremap().
*/
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)
{
@@ -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
* 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
* elements are each tagged with the appropriate dma address
* and length. They are obtained via sg_dma_{address,length}(SG).

12
arch/sparc/kernel/kernel.h
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);
/* compat_audit.c */
extern unsigned sparc32_dir_class[];
extern unsigned sparc32_chattr_class[];
extern unsigned sparc32_write_class[];
extern unsigned sparc32_read_class[];
extern unsigned sparc32_signal_class[];
int sparc32_classify_syscall(unsigned syscall);
extern unsigned int sparc32_dir_class[];
extern unsigned int sparc32_chattr_class[];
extern unsigned int sparc32_write_class[];
extern unsigned int sparc32_read_class[];
extern unsigned int sparc32_signal_class[];
int sparc32_classify_syscall(unsigned int syscall);
#endif
#ifdef CONFIG_SPARC32

2
arch/sparc/kernel/leon_kernel.c
View File

@@ -203,7 +203,7 @@ static struct irq_chip leon_irq = {
/*
* 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
* Per-CPU Edge - handle_percpu_irq, ack=0
*/

2
arch/sparc/kernel/process_64.c
View File

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

2
arch/sparc/kernel/setup_32.c
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... */
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);
}

2
arch/sparc/kernel/setup_64.c
View File

@@ -77,7 +77,7 @@ struct screen_info screen_info = {
};
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);
}

2
arch/sparc/kernel/signal32.c
View File

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

4
arch/sparc/kernel/sys_sparc_64.c
View File

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

2
arch/sparc/kernel/sysfs.c
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>
*/

4
arch/sparc/kernel/unaligned_64.c
View File

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