Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc464476 authored by Tony Luck's avatar Tony Luck
Browse files

Auto-update from upstream

parents 69124131 2da5bf80

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ DVB SUBSYSTEM AND DRIVERS 
P:	LinuxTV.org Project

M: 	linux-dvb-maintainer@linuxtv.org

L: 	linux-dvb@linuxtv.org (subscription required)

W:	http://linuxtv.org/developer/dvb.xml

W:	http://linuxtv.org/

S:	Supported



EATA-DMA SCSI DRIVER

arch/x86_64/kernel/smpboot.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static void __cpuinit tsc_sync_wait(void) 
{

	if (notscsync || !cpu_has_tsc)

		return;

	sync_tsc(boot_cpu_id);

	sync_tsc(0);

}



static __init int notscsync_setup(char *s)

drivers/net/e1000/e1000_main.c

+1 −0
Original line number Diff line number Diff line
@@ -3789,6 +3789,7 @@ e1000_netpoll(struct net_device *netdev) 
	struct e1000_adapter *adapter = netdev_priv(netdev);

	disable_irq(adapter->pdev->irq);

	e1000_intr(adapter->pdev->irq, netdev, NULL);

	e1000_clean_tx_irq(adapter);

	enable_irq(adapter->pdev->irq);

}

#endif

drivers/w1/w1.c

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ void w1_search(struct w1_master *dev, w1_slave_found_callback cb) 
		 * Return 0 - device(s) present, 1 - no devices present.

		 */

		if (w1_reset_bus(dev)) {

			dev_info(&dev->dev, "No devices present on the wire.\n");

			dev_dbg(&dev->dev, "No devices present on the wire.\n");

			break;

		}

include/linux/netpoll.h

+14 −6
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <linux/netdevice.h>

#include <linux/interrupt.h>

#include <linux/rcupdate.h>

#include <linux/list.h>



struct netpoll;
@@ -26,6 +27,7 @@ struct netpoll { 
struct netpoll_info {

	spinlock_t poll_lock;

	int poll_owner;

	int tries;

	int rx_flags;

	spinlock_t rx_lock;

	struct netpoll *rx_np; /* netpoll that registered an rx_hook */
@@ -60,25 +62,31 @@ static inline int netpoll_rx(struct sk_buff *skb) 
	return ret;

}



static inline void netpoll_poll_lock(struct net_device *dev)

static inline void *netpoll_poll_lock(struct net_device *dev)

{

	rcu_read_lock(); /* deal with race on ->npinfo */

	if (dev->npinfo) {

		spin_lock(&dev->npinfo->poll_lock);

		dev->npinfo->poll_owner = smp_processor_id();

		return dev->npinfo;

	}

	return NULL;

}



static inline void netpoll_poll_unlock(struct net_device *dev)

static inline void netpoll_poll_unlock(void *have)

{

	if (dev->npinfo) {

		dev->npinfo->poll_owner = -1;

		spin_unlock(&dev->npinfo->poll_lock);

	struct netpoll_info *npi = have;



	if (npi) {

		npi->poll_owner = -1;

		spin_unlock(&npi->poll_lock);

	}

	rcu_read_unlock();

}



#else

#define netpoll_rx(a) 0

#define netpoll_poll_lock(a)

#define netpoll_poll_lock(a) 0

#define netpoll_poll_unlock(a)

#endif