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

Commit 4b6ace7f authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream

parents b5ed7639 427abfa2

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 17

EXTRAVERSION =-rc6

EXTRAVERSION =

NAME=Crazed Snow-Weasel



# *DOCUMENTATION*

arch/powerpc/mm/hash_native_64.c

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static inline void __tlbie(unsigned long va, unsigned int psize) 
	default:

		penc = mmu_psize_defs[psize].penc;

		va &= ~((1ul << mmu_psize_defs[psize].shift) - 1);

		va |= (0x7f >> (8 - penc)) << 12;

		va |= penc << 12;

		asm volatile("tlbie %0,1" : : "r" (va) : "memory");

		break;

	}
@@ -74,7 +74,7 @@ static inline void __tlbiel(unsigned long va, unsigned int psize) 
	default:

		penc = mmu_psize_defs[psize].penc;

		va &= ~((1ul << mmu_psize_defs[psize].shift) - 1);

		va |= (0x7f >> (8 - penc)) << 12;

		va |= penc << 12;

		asm volatile(".long 0x7c000224 | (%0 << 11) | (1 << 21)"

			     : : "r"(va) : "memory");

		break;

block/cfq-iosched.c

+3 −8
Original line number Diff line number Diff line
@@ -1323,17 +1323,12 @@ cfq_alloc_io_context(struct cfq_data *cfqd, gfp_t gfp_mask) 
	struct cfq_io_context *cic = kmem_cache_alloc(cfq_ioc_pool, gfp_mask);



	if (cic) {

		RB_CLEAR(&cic->rb_node);

		cic->key = NULL;

		cic->cfqq[ASYNC] = NULL;

		cic->cfqq[SYNC] = NULL;

		memset(cic, 0, sizeof(*cic));

		RB_CLEAR_COLOR(&cic->rb_node);

		cic->last_end_request = jiffies;

		cic->ttime_total = 0;

		cic->ttime_samples = 0;

		cic->ttime_mean = 0;

		INIT_LIST_HEAD(&cic->queue_list);

		cic->dtor = cfq_free_io_context;

		cic->exit = cfq_exit_io_context;

		INIT_LIST_HEAD(&cic->queue_list);

		atomic_inc(&ioc_count);

	}

drivers/cdrom/cdrom.c

+4 −2
Original line number Diff line number Diff line
@@ -1009,9 +1009,9 @@ int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip, struct file *fp) 
		if (fp->f_mode & FMODE_WRITE) {

			ret = -EROFS;

			if (cdrom_open_write(cdi))

				goto err;

				goto err_release;

			if (!CDROM_CAN(CDC_RAM))

				goto err;

				goto err_release;

			ret = 0;

			cdi->media_written = 0;

		}
@@ -1026,6 +1026,8 @@ int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip, struct file *fp) 
	    not be mounting, but opening with O_NONBLOCK */

	check_disk_change(ip->i_bdev);

	return 0;

err_release:

	cdi->ops->release(cdi);

err:

	cdi->use_count--;

	return ret;

drivers/net/sky2.c

+6 −1
Original line number Diff line number Diff line
@@ -2255,8 +2255,10 @@ static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs) 
static void sky2_netpoll(struct net_device *dev)

{

	struct sky2_port *sky2 = netdev_priv(dev);

	struct net_device *dev0 = sky2->hw->dev[0];



	sky2_intr(sky2->hw->pdev->irq, sky2->hw, NULL);

	if (netif_running(dev) && __netif_rx_schedule_prep(dev0))

		__netif_rx_schedule(dev0);

}

#endif
@@ -3446,6 +3448,7 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state) 


			sky2_down(dev);

			netif_device_detach(dev);

			netif_poll_disable(dev);

		}

	}
@@ -3474,6 +3477,8 @@ static int sky2_resume(struct pci_dev *pdev) 
		struct net_device *dev = hw->dev[i];

		if (dev && netif_running(dev)) {

			netif_device_attach(dev);

			netif_poll_enable(dev);



			err = sky2_up(dev);

			if (err) {

				printk(KERN_ERR PFX "%s: could not up: %d\n",