Merge remote branch 'alsa/devel' into topic/usb (85ae01b2) · Commits · e / devices / android_kernel_fairphone_FP3

arch/x86/kernel/cpu/perf_event_amd.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -348,10 +348,12 @@ static void amd_pmu_cpu_offline(int cpu)

		raw_spin_lock(&amd_nb_lock);

		if (cpuhw->amd_nb) {
		if (--cpuhw->amd_nb->refcnt == 0)
		kfree(cpuhw->amd_nb);

		cpuhw->amd_nb = NULL;
		}

		raw_spin_unlock(&amd_nb_lock);
		}

drivers/char/virtio_console.c

+13 −2

Original line number	Diff line number	Diff line
		@@ -681,6 +681,10 @@ static void resize_console(struct port *port)
		struct virtio_device *vdev;
		struct winsize ws;

		/* The port could have been hot-unplugged */
		if (!port)
		return;

		vdev = port->portdev->vdev;
		if (virtio_has_feature(vdev, VIRTIO_CONSOLE_F_SIZE)) {
		vdev->config->get(vdev,
		@@ -947,11 +951,18 @@ static void handle_control_message(struct ports_device *portdev,
		*/
		err = sysfs_create_group(&port->dev->kobj,
		&port_attribute_group);
		if (err)
		if (err) {
		dev_err(port->dev,
		"Error %d creating sysfs device attributes\n",
		err);

		} else {
		/*
		* Generate a udev event so that appropriate
		* symlinks can be created based on udev
		* rules.
		*/
		kobject_uevent(&port->dev->kobj, KOBJ_CHANGE);
		}
		break;
		case VIRTIO_CONSOLE_PORT_REMOVE:
		/*

drivers/edac/edac_mce_amd.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -316,7 +316,12 @@ void amd_decode_nb_mce(int node_id, struct err_regs *regs, int handle_errors)
		if (regs->nbsh & K8_NBSH_ERR_CPU_VAL)
		pr_cont(", core: %u\n", (u8)(regs->nbsh & 0xf));
		} else {
		pr_cont(", core: %d\n", fls((regs->nbsh & 0xf) - 1));
		u8 assoc_cpus = regs->nbsh & 0xf;

		if (assoc_cpus > 0)
		pr_cont(", core: %d", fls(assoc_cpus) - 1);

		pr_cont("\n");
		}

		pr_emerg("%s.\n", EXT_ERR_MSG(xec));

drivers/net/arm/ks8695net.c

+9 −15

Original line number	Diff line number	Diff line
		@@ -451,9 +451,8 @@ ks8695_rx_irq(int irq, void *dev_id)
		/**
		* ks8695_rx - Receive packets called by NAPI poll method
		* @ksp: Private data for the KS8695 Ethernet
		* @budget: The max packets would be receive
		* @budget: Number of packets allowed to process
		*/

		static int ks8695_rx(struct ks8695_priv *ksp, int budget)
		{
		struct net_device *ndev = ksp->ndev;
		@@ -461,7 +460,6 @@ static int ks8695_rx(struct ks8695_priv *ksp, int budget)
		int buff_n;
		u32 flags;
		int pktlen;
		int last_rx_processed = -1;
		int received = 0;

		buff_n = ksp->next_rx_desc_read;
		@@ -471,6 +469,7 @@ static int ks8695_rx(struct ks8695_priv *ksp, int budget)
		cpu_to_le32(RDES_OWN)))) {
		rmb();
		flags = le32_to_cpu(ksp->rx_ring[buff_n].status);

		/* Found an SKB which we own, this means we
		* received a packet
		*/
		@@ -533,23 +532,18 @@ static int ks8695_rx(struct ks8695_priv *ksp, int budget)
		ksp->rx_ring[buff_n].status = cpu_to_le32(RDES_OWN);
		rx_finished:
		received++;
		/* And note this as processed so we can start
		* from here next time
		*/
		last_rx_processed = buff_n;
		buff_n = (buff_n + 1) & MAX_RX_DESC_MASK;
		/And note which RX descriptor we last did /
		if (likely(last_rx_processed != -1))
		ksp->next_rx_desc_read =
		(last_rx_processed + 1) &
		MAX_RX_DESC_MASK;
		}

		/* And note which RX descriptor we last did */
		ksp->next_rx_desc_read = buff_n;

		/* And refill the buffers */
		ks8695_refill_rxbuffers(ksp);

		/* Kick the RX DMA engine, in case it became
		* suspended */
		/* Kick the RX DMA engine, in case it became suspended */
		ks8695_writereg(ksp, KS8695_DRSC, 0);

		return received;
		}

drivers/net/igb/e1000_82575.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
		case E1000_DEV_ID_82576_FIBER:
		case E1000_DEV_ID_82576_SERDES:
		case E1000_DEV_ID_82576_QUAD_COPPER:
		case E1000_DEV_ID_82576_QUAD_COPPER_ET2:
		case E1000_DEV_ID_82576_SERDES_QUAD:
		mac->type = e1000_82576;
		break;