From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 12 Oct 2014 00:36:34 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=052db7ec86dff26f734031c3ef5c2c03a94af0af;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge git://git./linux/kernel/git/davem/sparc

Pull sparc updates from David Miller:

 1) Move to 4-level page tables on sparc64 and support up to 53-bits of
    physical addressing.  Kernel static image BSS size reduced by
    several megabytes.

 2) M6/M7 cpu support, from Allan Pais.

 3) Move to sparse IRQs, handle hypervisor TLB call errors more
    gracefully, and add T5 perf_event support.  From Bob Picco.

 4) Recognize cdroms and compute geometry from capacity in virtual disk
    driver, also from Allan Pais.

 5) Fix memset() return value on sparc32, from Andreas Larsson.

 6) Respect gfp flags in dma_alloc_coherent on sparc32, from Daniel
    Hellstrom.

 7) Fix handling of compound pages in virtual disk driver, from Dwight
    Engen.

 8) Fix lockdep warnings in LDC layer by moving IRQ requesting to
    ldc_alloc() from ldc_bind().

 9) Increase boot string length to 1024 bytes, from Dave Kleikamp.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: (31 commits)
  sparc64: Fix lockdep warnings on reboot on Ultra-5
  sparc64: Increase size of boot string to 1024 bytes
  sparc64: Kill unnecessary tables and increase MAX_BANKS.
  sparc64: sparse irq
  sparc64: Adjust vmalloc region size based upon available virtual address bits.
  sparc64: Increase MAX_PHYS_ADDRESS_BITS to 53.
  sparc64: Use kernel page tables for vmemmap.
  sparc64: Fix physical memory management regressions with large max_phys_bits.
  sparc64: Adjust KTSB assembler to support larger physical addresses.
  sparc64: Define VA hole at run time, rather than at compile time.
  sparc64: Switch to 4-level page tables.
  sparc64: Fix reversed start/end in flush_tlb_kernel_range()
  sparc64: Add vio_set_intr() to enable/disable Rx interrupts
  vio: fix reuse of vio_dring slot
  sunvdc: limit each sg segment to a page
  sunvdc: compute vdisk geometry from capacity
  sunvdc: add cdrom and v1.1 protocol support
  sparc: VIO protocol version 1.6
  sparc64: Fix hibernation code refrence to PAGE_OFFSET.
  sparc64: Move request_irq() from ldc_bind() to ldc_alloc()
  ...
---

052db7ec86dff26f734031c3ef5c2c03a94af0af
diff --cc drivers/net/ethernet/sun/sunvnet.c
index 15396720f489,b7cca71fbc90..3652afd3ec78
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@@ -1042,14 -742,11 +1042,14 @@@ static int vnet_start_xmit(struct sk_bu
  		goto out_dropped_unlock;
  	}
  
 +ldc_start_done:
 +	port->start_cons = false;
 +
  	dev->stats.tx_packets++;
 -	dev->stats.tx_bytes += skb->len;
 +	dev->stats.tx_bytes += port->tx_bufs[txi].skb->len;
  
  	dr->prod = (dr->prod + 1) & (VNET_TX_RING_SIZE - 1);
- 	if (unlikely(vnet_tx_dring_avail(dr) < 2)) {
+ 	if (unlikely(vnet_tx_dring_avail(dr) < 1)) {
  		netif_stop_queue(dev);
  		if (vnet_tx_dring_avail(dr) > VNET_TX_WAKEUP_THRESH(dr))
  			netif_wake_queue(dev);