korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 21:38:32 +08:00
Code Issues 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:

 1) Some implicit switch fallthrough fixes from Stephen Rothwell.

 2) Missing of_node_put() in various sparc drivers from Yangtao Li.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  drivers/tty: add missing of_node_put()
  drivers/sbus/char: add of_node_put()
  sbus: char: add of_node_put()
  sparc32: supress another implicit-fallthrough warning
  sparc32: suppress an implicit-fallthrough warning
  sparc: suppress the implicit-fallthrough warning
  arch/sparc: Use kzalloc_node
This commit is contained in:
Linus Torvalds 2018-12-03 09:35:27 -08:00
commit 9099ff769f
7 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/sparc/kernel/iommu.c
View File

@ -108,10 +108,9 @@ int iommu_table_init(struct iommu *iommu, int tsbsize,
/* Allocate and initialize the free area map. */ /* Allocate and initialize the free area map. */
sz = num_tsb_entries / 8; sz = num_tsb_entries / 8;
sz = (sz + 7UL) & ~7UL; sz = (sz + 7UL) & ~7UL;
iommu->tbl.map = kmalloc_node(sz, GFP_KERNEL, numa_node); iommu->tbl.map = kzalloc_node(sz, GFP_KERNEL, numa_node);
if (!iommu->tbl.map) if (!iommu->tbl.map)
return -ENOMEM; return -ENOMEM;
memset(iommu->tbl.map, 0, sz);
iommu_tbl_pool_init(&iommu->tbl, num_tsb_entries, IO_PAGE_SHIFT, iommu_tbl_pool_init(&iommu->tbl, num_tsb_entries, IO_PAGE_SHIFT,
(tlb_type != hypervisor ? iommu_flushall : NULL), (tlb_type != hypervisor ? iommu_flushall : NULL),

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

@ -683,6 +683,7 @@ void do_signal32(struct pt_regs * regs)
regs->tpc -= 4; regs->tpc -= 4;
regs->tnpc -= 4; regs->tnpc -= 4;
pt_regs_clear_syscall(regs); pt_regs_clear_syscall(regs);
/* fall through */
case ERESTART_RESTARTBLOCK: case ERESTART_RESTARTBLOCK:
regs->u_regs[UREG_G1] = __NR_restart_syscall; regs->u_regs[UREG_G1] = __NR_restart_syscall;
regs->tpc -= 4; regs->tpc -= 4;

1
arch/sparc/kernel/signal_32.c
View File

@ -508,6 +508,7 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
regs->pc -= 4; regs->pc -= 4;
regs->npc -= 4; regs->npc -= 4;
pt_regs_clear_syscall(regs); pt_regs_clear_syscall(regs);
/* fall through */
case ERESTART_RESTARTBLOCK: case ERESTART_RESTARTBLOCK:
regs->u_regs[UREG_G1] = __NR_restart_syscall; regs->u_regs[UREG_G1] = __NR_restart_syscall;
regs->pc -= 4; regs->pc -= 4;

1
arch/sparc/kernel/signal_64.c
View File

@ -533,6 +533,7 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
regs->tpc -= 4; regs->tpc -= 4;
regs->tnpc -= 4; regs->tnpc -= 4;
pt_regs_clear_syscall(regs); pt_regs_clear_syscall(regs);
/* fall through */
case ERESTART_RESTARTBLOCK: case ERESTART_RESTARTBLOCK:
regs->u_regs[UREG_G1] = __NR_restart_syscall; regs->u_regs[UREG_G1] = __NR_restart_syscall;
regs->tpc -= 4; regs->tpc -= 4;

1
drivers/sbus/char/display7seg.c
View File

@ -220,6 +220,7 @@ static int d7s_probe(struct platform_device *op)
dev_set_drvdata(&op->dev, p); dev_set_drvdata(&op->dev, p);
d7s_device = p; d7s_device = p;
err = 0; err = 0;
of_node_put(opts);
out: out:
return err; return err;

2
drivers/sbus/char/envctrl.c
View File

@ -910,8 +910,10 @@ static void envctrl_init_i2c_child(struct device_node *dp,
for (len = 0; len < PCF8584_MAX_CHANNELS; ++len) { for (len = 0; len < PCF8584_MAX_CHANNELS; ++len) {
pchild->mon_type[len] = ENVCTRL_NOMON; pchild->mon_type[len] = ENVCTRL_NOMON;
} }
of_node_put(root_node);
return; return;
} }
of_node_put(root_node);
} }
/* Get the monitor channels. */ /* Get the monitor channels. */

1
drivers/tty/serial/suncore.c
View File

@ -112,6 +112,7 @@ void sunserial_console_termios(struct console *con, struct device_node *uart_dp)
mode = of_get_property(dp, mode_prop, NULL); mode = of_get_property(dp, mode_prop, NULL);
if (!mode) if (!mode)
mode = "9600,8,n,1,-"; mode = "9600,8,n,1,-";
of_node_put(dp);
} }
cflag = CREAD | HUPCL | CLOCAL; cflag = CREAD | HUPCL | CLOCAL;