Commit 9099ff76 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 25956467 dac097c4

arch/sparc/kernel/iommu.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -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),

arch/sparc/kernel/signal32.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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;

arch/sparc/kernel/signal_32.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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;

arch/sparc/kernel/signal_64.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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;

drivers/sbus/char/display7seg.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE