[gentoo-commits] linux-patches r1532 - genpatches-2.6/trunk/2.6.28

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2009-03-24 02:08:56 +0000 (Tue, 24 Mar 2009)
New Revision: 1532

Added:
   genpatches-2.6/trunk/2.6.28/1008_linux-2.6.28.9.patch
   genpatches-2.6/trunk/2.6.28/2910_makefile-cflags.patch
Removed:
   genpatches-2.6/trunk/2.6.28/2705_i915-no-vblank-on-disabled-pipe.patch
   genpatches-2.6/trunk/2.6.28/2710_i915-set-vblank-flag-correctly.patch
Modified:
   genpatches-2.6/trunk/2.6.28/0000_README
Log:
Linux 2.6.28.9. Removal of redundant patches. Addtion of cflags patch for the main makefile to disable invalid cant wrap optizations.

Modified: genpatches-2.6/trunk/2.6.28/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.28/0000_README	2009-03-21 15:32:23 UTC (rev 1531)
+++ genpatches-2.6/trunk/2.6.28/0000_README	2009-03-24 02:08:56 UTC (rev 1532)
@@ -119,18 +119,14 @@
 From:	http://bugs.gentoo.org/254793
 Desc:	Fix boot hang with pata_hpt366 driver
 
-Patch:	2705_i915-no-vblank-on-disabled-pipe.patch
-From:	http://bugs.gentoo.org/253813
-ppDesc:	Fix crash with GEM + compiz
-
-Patch:	2710_i915-set-vblank-flag-correctly.patch
-From;	http://bugs.gentoo.org/253813
-Desc:	Fix crash with GEM + compiz
-
 Patch:	2900_IT8720-chipset-support-and-type-values-fix.patch
 From:	http://bugs.gentoo.org/show_bug.cgi?id=245625
 Desc:	Patch to retrieve sensor information from the IT8720 chipset and type values fixes
 
+Patch:	2910_makefile-cflags.patch
+From:	http://www.kernel.org
+Desc:	Disable invalid "can't wrap" optimzations for signed / pointers
+
 Patch:	4100_dm-bbr.patch
 From:	EVMS 2.5.2
 Desc:	Bad block relocation support for LiveCD users

Added: genpatches-2.6/trunk/2.6.28/1008_linux-2.6.28.9.patch
===================================================================
--- genpatches-2.6/trunk/2.6.28/1008_linux-2.6.28.9.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.28/1008_linux-2.6.28.9.patch	2009-03-24 02:08:56 UTC (rev 1532)
@@ -0,0 +1,1319 @@
+diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
+index 0429d3e..4d19a0b 100644
+--- a/arch/ia64/Kconfig
++++ b/arch/ia64/Kconfig
+@@ -479,8 +479,7 @@ config HOLES_IN_ZONE
+ 	default y if VIRTUAL_MEM_MAP
+ 
+ config HAVE_ARCH_EARLY_PFN_TO_NID
+-	def_bool y
+-	depends on NEED_MULTIPLE_NODES
++	def_bool NUMA && SPARSEMEM
+ 
+ config HAVE_ARCH_NODEDATA_EXTENSION
+ 	def_bool y
+diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
+index 26ecb96..507fc15 100644
+--- a/arch/powerpc/sysdev/fsl_soc.c
++++ b/arch/powerpc/sysdev/fsl_soc.c
+@@ -257,7 +257,7 @@ static int __init gfar_mdio_of_init(void)
+ 		gfar_mdio_of_init_one(np);
+ 
+ 	/* try the deprecated version */
+-	for_each_compatible_node(np, "mdio", "gianfar");
++	for_each_compatible_node(np, "mdio", "gianfar")
+ 		gfar_mdio_of_init_one(np);
+ 
+ 	return 0;
+diff --git a/arch/s390/lib/div64.c b/arch/s390/lib/div64.c
+index a5f8300..d9e62c0 100644
+--- a/arch/s390/lib/div64.c
++++ b/arch/s390/lib/div64.c
+@@ -61,7 +61,7 @@ static uint32_t __div64_31(uint64_t *n, uint32_t base)
+ 		"	clr	%0,%3\n"
+ 		"	jl	0f\n"
+ 		"	slr	%0,%3\n"
+-		"	alr	%1,%2\n"
++		"	ahi	%1,1\n"
+ 		"0:\n"
+ 		: "+d" (reg2), "+d" (reg3), "=d" (tmp)
+ 		: "d" (base), "2" (1UL) : "cc" );
+diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
+index e38859d..07684f8 100644
+--- a/arch/x86/include/asm/msr-index.h
++++ b/arch/x86/include/asm/msr-index.h
+@@ -200,6 +200,35 @@
+ #define MSR_IA32_THERM_STATUS		0x0000019c
+ #define MSR_IA32_MISC_ENABLE		0x000001a0
+ 
++/* MISC_ENABLE bits: architectural */
++#define MSR_IA32_MISC_ENABLE_FAST_STRING	(1ULL << 0)
++#define MSR_IA32_MISC_ENABLE_TCC		(1ULL << 1)
++#define MSR_IA32_MISC_ENABLE_EMON		(1ULL << 7)
++#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL	(1ULL << 11)
++#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL	(1ULL << 12)
++#define MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP	(1ULL << 16)
++#define MSR_IA32_MISC_ENABLE_MWAIT		(1ULL << 18)
++#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID	(1ULL << 22)
++#define MSR_IA32_MISC_ENABLE_XTPR_DISABLE	(1ULL << 23)
++#define MSR_IA32_MISC_ENABLE_XD_DISABLE		(1ULL << 34)
++
++/* MISC_ENABLE bits: model-specific, meaning may vary from core to core */
++#define MSR_IA32_MISC_ENABLE_X87_COMPAT		(1ULL << 2)
++#define MSR_IA32_MISC_ENABLE_TM1		(1ULL << 3)
++#define MSR_IA32_MISC_ENABLE_SPLIT_LOCK_DISABLE	(1ULL << 4)
++#define MSR_IA32_MISC_ENABLE_L3CACHE_DISABLE	(1ULL << 6)
++#define MSR_IA32_MISC_ENABLE_SUPPRESS_LOCK	(1ULL << 8)
++#define MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE	(1ULL << 9)
++#define MSR_IA32_MISC_ENABLE_FERR		(1ULL << 10)
++#define MSR_IA32_MISC_ENABLE_FERR_MULTIPLEX	(1ULL << 10)
++#define MSR_IA32_MISC_ENABLE_TM2		(1ULL << 13)
++#define MSR_IA32_MISC_ENABLE_ADJ_PREF_DISABLE	(1ULL << 19)
++#define MSR_IA32_MISC_ENABLE_SPEEDSTEP_LOCK	(1ULL << 20)
++#define MSR_IA32_MISC_ENABLE_L1D_CONTEXT	(1ULL << 24)
++#define MSR_IA32_MISC_ENABLE_DCU_PREF_DISABLE	(1ULL << 37)
++#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE	(1ULL << 38)
++#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE	(1ULL << 39)
++
+ /* Intel Model 6 */
+ #define MSR_P6_EVNTSEL0			0x00000186
+ #define MSR_P6_EVNTSEL1			0x00000187
+diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
+index 57e3fba..d8cfe54 100644
+--- a/arch/x86/kernel/cpu/intel.c
++++ b/arch/x86/kernel/cpu/intel.c
+@@ -30,6 +30,19 @@
+ 
+ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
+ {
++	/* Unmask CPUID levels if masked: */
++	if (c->x86 == 6 && c->x86_model >= 15) {
++		u64 misc_enable;
++
++		rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
++
++		if (misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) {
++			misc_enable &= ~MSR_IA32_MISC_ENABLE_LIMIT_CPUID;
++			wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
++			c->cpuid_level = cpuid_eax(0);
++		}
++	}
++
+ 	if ((c->x86 == 0xf && c->x86_model >= 0x03) ||
+ 		(c->x86 == 0x6 && c->x86_model >= 0x0e))
+ 		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
+diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
+index c11936e..458532d 100644
+--- a/drivers/ata/ata_piix.c
++++ b/drivers/ata/ata_piix.c
+@@ -1294,6 +1294,39 @@ static const int *__devinit piix_init_sata_map(struct pci_dev *pdev,
+ 	return map;
+ }
+ 
++static bool piix_no_sidpr(struct ata_host *host)
++{
++	struct pci_dev *pdev = to_pci_dev(host->dev);
++
++	/*
++	 * Samsung DB-P70 only has three ATA ports exposed and
++	 * curiously the unconnected first port reports link online
++	 * while not responding to SRST protocol causing excessive
++	 * detection delay.
++	 *
++	 * Unfortunately, the system doesn't carry enough DMI
++	 * information to identify the machine but does have subsystem
++	 * vendor and device set.  As it's unclear whether the
++	 * subsystem vendor/device is used only for this specific
++	 * board, the port can't be disabled solely with the
++	 * information; however, turning off SIDPR access works around
++	 * the problem.  Turn it off.
++	 *
++	 * This problem is reported in bnc#441240.
++	 *
++	 * https://bugzilla.novell.com/show_bug.cgi?id=441420
++	 */
++	if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x2920 &&
++	    pdev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG &&
++	    pdev->subsystem_device == 0xb049) {
++		dev_printk(KERN_WARNING, host->dev,
++			   "Samsung DB-P70 detected, disabling SIDPR\n");
++		return true;
++	}
++
++	return false;
++}
++
+ static int __devinit piix_init_sidpr(struct ata_host *host)
+ {
+ 	struct pci_dev *pdev = to_pci_dev(host->dev);
+@@ -1307,6 +1340,10 @@ static int __devinit piix_init_sidpr(struct ata_host *host)
+ 		if (hpriv->map[i] == IDE)
+ 			return 0;
+ 
++	/* is it blacklisted? */
++	if (piix_no_sidpr(host))
++		return 0;
++
+ 	if (!(host->ports[0]->flags & PIIX_FLAG_SIDPR))
+ 		return 0;
+ 
+diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
+index 1e787f8..e2f5d23 100644
+--- a/drivers/gpu/drm/drm_irq.c
++++ b/drivers/gpu/drm/drm_irq.c
+@@ -259,7 +259,8 @@ EXPORT_SYMBOL(drm_irq_install);
+  */
+ int drm_irq_uninstall(struct drm_device * dev)
+ {
+-	int irq_enabled;
++	unsigned long irqflags;
++	int irq_enabled, i;
+ 
+ 	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
+ 		return -EINVAL;
+@@ -269,6 +270,16 @@ int drm_irq_uninstall(struct drm_device * dev)
+ 	dev->irq_enabled = 0;
+ 	mutex_unlock(&dev->struct_mutex);
+ 
++	/*
++	 * Wake up any waiters so they don't hang.
++	 */
++	spin_lock_irqsave(&dev->vbl_lock, irqflags);
++	for (i = 0; i < dev->num_crtcs; i++) {
++		DRM_WAKEUP(&dev->vbl_queue[i]);
++		dev->vblank_enabled[i] = 0;
++	}
++	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
++
+ 	if (!irq_enabled)
+ 		return -EINVAL;
+ 
+@@ -617,8 +628,9 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
+ 		DRM_DEBUG("waiting on vblank count %d, crtc %d\n",
+ 			  vblwait->request.sequence, crtc);
+ 		DRM_WAIT_ON(ret, dev->vbl_queue[crtc], 3 * DRM_HZ,
+-			    ((drm_vblank_count(dev, crtc)
+-			      - vblwait->request.sequence) <= (1 << 23)));
++			    (((drm_vblank_count(dev, crtc) -
++			       vblwait->request.sequence) <= (1 << 23)) ||
++			     !dev->irq_enabled));
+ 
+ 		if (ret != -EINTR) {
+ 			struct timeval now;
+diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
+index 24fe8c1..7247824 100644
+--- a/drivers/gpu/drm/i915/i915_gem.c
++++ b/drivers/gpu/drm/i915/i915_gem.c
+@@ -1161,6 +1161,8 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)
+ 	struct drm_mm_node *free_space;
+ 	int page_count, ret;
+ 
++	if (dev_priv->mm.suspended)
++		return -EBUSY;
+ 	if (alignment == 0)
+ 		alignment = PAGE_SIZE;
+ 	if (alignment & (PAGE_SIZE - 1)) {
+@@ -2029,13 +2031,15 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
+ 
+ 		/* error other than GTT full, or we've already tried again */
+ 		if (ret != -ENOMEM || pin_tries >= 1) {
+-			DRM_ERROR("Failed to pin buffers %d\n", ret);
++			if (ret != -ERESTARTSYS)
++				DRM_ERROR("Failed to pin buffers %d\n", ret);
+ 			goto err;
+ 		}
+ 
+ 		/* unpin all of our buffers */
+ 		for (i = 0; i < pinned; i++)
+ 			i915_gem_object_unpin(object_list[i]);
++		pinned = 0;
+ 
+ 		/* evict everyone we can from the aperture */
+ 		ret = i915_gem_evict_everything(dev);
+@@ -2178,7 +2182,8 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment)
+ 	if (obj_priv->gtt_space == NULL) {
+ 		ret = i915_gem_object_bind_to_gtt(obj, alignment);
+ 		if (ret != 0) {
+-			DRM_ERROR("Failure to bind: %d", ret);
++			if (ret != -EBUSY && ret != -ERESTARTSYS)
++				DRM_ERROR("Failure to bind: %d", ret);
+ 			return ret;
+ 		}
+ 	}
+@@ -2700,20 +2705,21 @@ i915_gem_entervt_ioctl(struct drm_device *dev, void *data,
+ 		dev_priv->mm.wedged = 0;
+ 	}
+ 
+-	ret = i915_gem_init_ringbuffer(dev);
+-	if (ret != 0)
+-		return ret;
+-
+ 	dev_priv->mm.gtt_mapping = io_mapping_create_wc(dev->agp->base,
+ 							dev->agp->agp_info.aper_size
+ 							* 1024 * 1024);
+ 
+ 	mutex_lock(&dev->struct_mutex);
++	dev_priv->mm.suspended = 0;
++
++	ret = i915_gem_init_ringbuffer(dev);
++	if (ret != 0)
++		return ret;
++
+ 	BUG_ON(!list_empty(&dev_priv->mm.active_list));
+ 	BUG_ON(!list_empty(&dev_priv->mm.flushing_list));
+ 	BUG_ON(!list_empty(&dev_priv->mm.inactive_list));
+ 	BUG_ON(!list_empty(&dev_priv->mm.request_list));
+-	dev_priv->mm.suspended = 0;
+ 	mutex_unlock(&dev->struct_mutex);
+ 
+ 	drm_irq_install(dev);
+diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
+index 69b9a42..81ac2bd 100644
+--- a/drivers/gpu/drm/i915/i915_irq.c
++++ b/drivers/gpu/drm/i915/i915_irq.c
+@@ -400,6 +400,12 @@ int i915_enable_vblank(struct drm_device *dev, int pipe)
+ {
+ 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+ 	unsigned long irqflags;
++	int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
++	u32 pipeconf;
++
++	pipeconf = I915_READ(pipeconf_reg);
++	if (!(pipeconf & PIPEACONF_ENABLE))
++		return -EINVAL;
+ 
+ 	spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
+ 	if (IS_I965G(dev))
+diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
+index ce26c84..51047d3 100644
+--- a/drivers/md/dm-crypt.c
++++ b/drivers/md/dm-crypt.c
+@@ -60,6 +60,7 @@ struct dm_crypt_io {
+ };
+ 
+ struct dm_crypt_request {
++	struct convert_context *ctx;
+ 	struct scatterlist sg_in;
+ 	struct scatterlist sg_out;
+ };
+@@ -335,6 +336,18 @@ static void crypt_convert_init(struct crypt_config *cc,
+ 	init_completion(&ctx->restart);
+ }
+ 
++static struct dm_crypt_request *dmreq_of_req(struct crypt_config *cc,
++					     struct ablkcipher_request *req)
++{
++	return (struct dm_crypt_request *)((char *)req + cc->dmreq_start);
++}
++
++static struct ablkcipher_request *req_of_dmreq(struct crypt_config *cc,
++					       struct dm_crypt_request *dmreq)
++{
++	return (struct ablkcipher_request *)((char *)dmreq - cc->dmreq_start);
++}
++
+ static int crypt_convert_block(struct crypt_config *cc,
+ 			       struct convert_context *ctx,
+ 			       struct ablkcipher_request *req)
+@@ -345,10 +358,11 @@ static int crypt_convert_block(struct crypt_config *cc,
+ 	u8 *iv;
+ 	int r = 0;
+ 
+-	dmreq = (struct dm_crypt_request *)((char *)req + cc->dmreq_start);
++	dmreq = dmreq_of_req(cc, req);
+ 	iv = (u8 *)ALIGN((unsigned long)(dmreq + 1),
+ 			 crypto_ablkcipher_alignmask(cc->tfm) + 1);
+ 
++	dmreq->ctx = ctx;
+ 	sg_init_table(&dmreq->sg_in, 1);
+ 	sg_set_page(&dmreq->sg_in, bv_in->bv_page, 1 << SECTOR_SHIFT,
+ 		    bv_in->bv_offset + ctx->offset_in);
+@@ -395,8 +409,9 @@ static void crypt_alloc_req(struct crypt_config *cc,
+ 		cc->req = mempool_alloc(cc->req_pool, GFP_NOIO);
+ 	ablkcipher_request_set_tfm(cc->req, cc->tfm);
+ 	ablkcipher_request_set_callback(cc->req, CRYPTO_TFM_REQ_MAY_BACKLOG |
+-					     CRYPTO_TFM_REQ_MAY_SLEEP,
+-					     kcryptd_async_done, ctx);
++					CRYPTO_TFM_REQ_MAY_SLEEP,
++					kcryptd_async_done,
++					dmreq_of_req(cc, cc->req));
+ }
+ 
+ /*
+@@ -553,19 +568,22 @@ static void crypt_inc_pending(struct dm_crypt_io *io)
+ static void crypt_dec_pending(struct dm_crypt_io *io)
+ {
+ 	struct crypt_config *cc = io->target->private;
++	struct bio *base_bio = io->base_bio;
++	struct dm_crypt_io *base_io = io->base_io;
++	int error = io->error;
+ 
+ 	if (!atomic_dec_and_test(&io->pending))
+ 		return;
+ 
+-	if (likely(!io->base_io))
+-		bio_endio(io->base_bio, io->error);
++	mempool_free(io, cc->io_pool);
++
++	if (likely(!base_io))
++		bio_endio(base_bio, error);
+ 	else {
+-		if (io->error && !io->base_io->error)
+-			io->base_io->error = io->error;
+-		crypt_dec_pending(io->base_io);
++		if (error && !base_io->error)
++			base_io->error = error;
++		crypt_dec_pending(base_io);
+ 	}
+-
+-	mempool_free(io, cc->io_pool);
+ }
+ 
+ /*
+@@ -821,7 +839,8 @@ static void kcryptd_crypt_read_convert(struct dm_crypt_io *io)
+ static void kcryptd_async_done(struct crypto_async_request *async_req,
+ 			       int error)
+ {
+-	struct convert_context *ctx = async_req->data;
++	struct dm_crypt_request *dmreq = async_req->data;
++	struct convert_context *ctx = dmreq->ctx;
+ 	struct dm_crypt_io *io = container_of(ctx, struct dm_crypt_io, ctx);
+ 	struct crypt_config *cc = io->target->private;
+ 
+@@ -830,7 +849,7 @@ static void kcryptd_async_done(struct crypto_async_request *async_req,
+ 		return;
+ 	}
+ 
+-	mempool_free(ablkcipher_request_cast(async_req), cc->req_pool);
++	mempool_free(req_of_dmreq(cc, dmreq), cc->req_pool);
+ 
+ 	if (!atomic_dec_and_test(&ctx->pending))
+ 		return;
+diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
+index 2fd6d44..657e1dd 100644
+--- a/drivers/md/dm-io.c
++++ b/drivers/md/dm-io.c
+@@ -292,6 +292,8 @@ static void do_region(int rw, unsigned region, struct dm_io_region *where,
+ 					     (PAGE_SIZE >> SECTOR_SHIFT));
+ 		num_bvecs = 1 + min_t(int, bio_get_nr_vecs(where->bdev),
+ 				      num_bvecs);
++		if (unlikely(num_bvecs > BIO_MAX_PAGES))
++			num_bvecs = BIO_MAX_PAGES;
+ 		bio = bio_alloc_bioset(GFP_NOIO, num_bvecs, io->client->bios);
+ 		bio->bi_sector = where->sector + (where->count - remaining);
+ 		bio->bi_bdev = where->bdev;
+diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
+index 777c948..c4819b6 100644
+--- a/drivers/md/dm-ioctl.c
++++ b/drivers/md/dm-ioctl.c
+@@ -704,7 +704,8 @@ static int dev_rename(struct dm_ioctl *param, size_t param_size)
+ 	char *new_name = (char *) param + param->data_start;
+ 
+ 	if (new_name < param->data ||
+-	    invalid_str(new_name, (void *) param + param_size)) {
++	    invalid_str(new_name, (void *) param + param_size) ||
++	    strlen(new_name) > DM_NAME_LEN - 1) {
+ 		DMWARN("Invalid new logical volume name supplied.");
+ 		return -EINVAL;
+ 	}
+diff --git a/drivers/md/dm.c b/drivers/md/dm.c
+index c99e472..b798bd3 100644
+--- a/drivers/md/dm.c
++++ b/drivers/md/dm.c
+@@ -480,9 +480,12 @@ static int __noflush_suspending(struct mapped_device *md)
+ static void dec_pending(struct dm_io *io, int error)
+ {
+ 	unsigned long flags;
++	int io_error;
++	struct bio *bio;
++	struct mapped_device *md = io->md;
+ 
+ 	/* Push-back supersedes any I/O errors */
+-	if (error && !(io->error > 0 && __noflush_suspending(io->md)))
++	if (error && !(io->error > 0 && __noflush_suspending(md)))
+ 		io->error = error;
+ 
+ 	if (atomic_dec_and_test(&io->io_count)) {
+@@ -492,25 +495,28 @@ static void dec_pending(struct dm_io *io, int error)
+ 			 * This must be handled before the sleeper on
+ 			 * suspend queue merges the pushback list.
+ 			 */
+-			spin_lock_irqsave(&io->md->pushback_lock, flags);
+-			if (__noflush_suspending(io->md))
+-				bio_list_add(&io->md->pushback, io->bio);
++			spin_lock_irqsave(&md->pushback_lock, flags);
++			if (__noflush_suspending(md))
++				bio_list_add(&md->pushback, io->bio);
+ 			else
+ 				/* noflush suspend was interrupted. */
+ 				io->error = -EIO;
+-			spin_unlock_irqrestore(&io->md->pushback_lock, flags);
++			spin_unlock_irqrestore(&md->pushback_lock, flags);
+ 		}
+ 
+ 		end_io_acct(io);
+ 
+-		if (io->error != DM_ENDIO_REQUEUE) {
+-			blk_add_trace_bio(io->md->queue, io->bio,
++		io_error = io->error;
++		bio = io->bio;
++
++		free_io(md, io);
++
++		if (io_error != DM_ENDIO_REQUEUE) {
++			blk_add_trace_bio(md->queue, io->bio,
+ 					  BLK_TA_COMPLETE);
+ 
+-			bio_endio(io->bio, io->error);
++			bio_endio(bio, io_error);
+ 		}
+-
+-		free_io(io->md, io);
+ 	}
+ }
+ 
+@@ -518,6 +524,7 @@ static void clone_endio(struct bio *bio, int error)
+ {
+ 	int r = 0;
+ 	struct dm_target_io *tio = bio->bi_private;
++	struct dm_io *io = tio->io;
+ 	struct mapped_device *md = tio->io->md;
+ 	dm_endio_fn endio = tio->ti->type->end_io;
+ 
+@@ -541,15 +548,14 @@ static void clone_endio(struct bio *bio, int error)
+ 		}
+ 	}
+ 
+-	dec_pending(tio->io, error);
+-
+ 	/*
+ 	 * Store md for cleanup instead of tio which is about to get freed.
+ 	 */
+ 	bio->bi_private = md->bs;
+ 
+-	bio_put(bio);
+ 	free_tio(md, tio);
++	bio_put(bio);
++	dec_pending(io, error);
+ }
+ 
+ static sector_t max_io_len(struct mapped_device *md,
+diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
+index 00831f3..c388579 100644
+--- a/drivers/media/video/cx23885/cx23885-417.c
++++ b/drivers/media/video/cx23885/cx23885-417.c
+@@ -1585,7 +1585,8 @@ static int mpeg_open(struct inode *inode, struct file *file)
+ 	lock_kernel();
+ 	list_for_each(list, &cx23885_devlist) {
+ 		h = list_entry(list, struct cx23885_dev, devlist);
+-		if (h->v4l_device->minor == minor) {
++		if (h->v4l_device &&
++		    h->v4l_device->minor == minor) {
+ 			dev = h;
+ 			break;
+ 		}
+diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
+index c742a10..0aabc53 100644
+--- a/drivers/media/video/cx23885/cx23885-video.c
++++ b/drivers/media/video/cx23885/cx23885-video.c
+@@ -730,12 +730,13 @@ static int video_open(struct inode *inode, struct file *file)
+ 	lock_kernel();
+ 	list_for_each(list, &cx23885_devlist) {
+ 		h = list_entry(list, struct cx23885_dev, devlist);
+-		if (h->video_dev->minor == minor) {
++		if (h->video_dev &&
++		    h->video_dev->minor == minor) {
+ 			dev  = h;
+ 			type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ 		}
+ 		if (h->vbi_dev &&
+-		   h->vbi_dev->minor == minor) {
++		    h->vbi_dev->minor == minor) {
+ 			dev  = h;
+ 			type = V4L2_BUF_TYPE_VBI_CAPTURE;
+ 		}
+diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
+index 899766e..36b88e7 100644
+--- a/drivers/misc/thinkpad_acpi.c
++++ b/drivers/misc/thinkpad_acpi.c
+@@ -6927,7 +6927,7 @@ MODULE_ALIAS(TPACPI_DRVR_SHORTNAME);
+  * if it is not there yet.
+  */
+ #define IBM_BIOS_MODULE_ALIAS(__type) \
+-	MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW")
++	MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW*")
+ 
+ /* Non-ancient thinkpads */
+ MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*");
+@@ -6936,9 +6936,9 @@ MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*");
+ /* Ancient thinkpad BIOSes have to be identified by
+  * BIOS type or model number, and there are far less
+  * BIOS types than model numbers... */
+-IBM_BIOS_MODULE_ALIAS("I[B,D,H,I,M,N,O,T,W,V,Y,Z]");
+-IBM_BIOS_MODULE_ALIAS("1[0,3,6,8,A-G,I,K,M-P,S,T]");
+-IBM_BIOS_MODULE_ALIAS("K[U,X-Z]");
++IBM_BIOS_MODULE_ALIAS("I[BDHIMNOTWVYZ]");
++IBM_BIOS_MODULE_ALIAS("1[0368A-GIKM-PST]");
++IBM_BIOS_MODULE_ALIAS("K[UX-Z]");
+ 
+ MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh");
+ MODULE_DESCRIPTION(TPACPI_DESC);
+diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
+index 43a863c..aeb188a 100644
+--- a/drivers/usb/class/usbtmc.c
++++ b/drivers/usb/class/usbtmc.c
+@@ -49,6 +49,7 @@
+ 
+ static struct usb_device_id usbtmc_devices[] = {
+ 	{ USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 0), },
++	{ USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 1), },
+ 	{ 0, } /* terminating entry */
+ };
+ MODULE_DEVICE_TABLE(usb, usbtmc_devices);
+@@ -105,12 +106,13 @@ static int usbtmc_open(struct inode *inode, struct file *filp)
+ {
+ 	struct usb_interface *intf;
+ 	struct usbtmc_device_data *data;
+-	int retval = -ENODEV;
++	int retval = 0;
+ 
+ 	intf = usb_find_interface(&usbtmc_driver, iminor(inode));
+ 	if (!intf) {
+ 		printk(KERN_ERR KBUILD_MODNAME
+ 		       ": can not find device for minor %d", iminor(inode));
++		retval = -ENODEV;
+ 		goto exit;
+ 	}
+ 
+diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
+index c7e5339..7d6611a 100644
+--- a/drivers/usb/core/devio.c
++++ b/drivers/usb/core/devio.c
+@@ -359,11 +359,6 @@ static void destroy_async(struct dev_state *ps, struct list_head *list)
+ 		spin_lock_irqsave(&ps->lock, flags);
+ 	}
+ 	spin_unlock_irqrestore(&ps->lock, flags);
+-	as = async_getcompleted(ps);
+-	while (as) {
+-		free_async(as);
+-		as = async_getcompleted(ps);
+-	}
+ }
+ 
+ static void destroy_async_on_interface(struct dev_state *ps,
+@@ -642,6 +637,7 @@ static int usbdev_release(struct inode *inode, struct file *file)
+ 	struct dev_state *ps = file->private_data;
+ 	struct usb_device *dev = ps->dev;
+ 	unsigned int ifnum;
++	struct async *as;
+ 
+ 	usb_lock_device(dev);
+ 
+@@ -660,6 +656,12 @@ static int usbdev_release(struct inode *inode, struct file *file)
+ 	usb_unlock_device(dev);
+ 	usb_put_dev(dev);
+ 	put_pid(ps->disc_pid);
++
++	as = async_getcompleted(ps);
++	while (as) {
++		free_async(as);
++		as = async_getcompleted(ps);
++	}
+ 	kfree(ps);
+ 	return 0;
+ }
+diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
+index 3712b92..ecc9b66 100644
+--- a/drivers/usb/host/ehci-q.c
++++ b/drivers/usb/host/ehci-q.c
+@@ -1095,7 +1095,8 @@ static void start_unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)
+ 	prev->qh_next = qh->qh_next;
+ 	wmb ();
+ 
+-	if (unlikely (ehci_to_hcd(ehci)->state == HC_STATE_HALT)) {
++	/* If the controller isn't running, we don't have to wait for it */
++	if (unlikely(!HC_IS_RUNNING(ehci_to_hcd(ehci)->state))) {
+ 		/* if (unlikely (qh->reclaim != 0))
+ 		 *	this will recurse, probably not much
+ 		 */
+diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
+index 07bcb93..1d0b49e 100644
+--- a/drivers/usb/host/ehci-sched.c
++++ b/drivers/usb/host/ehci-sched.c
+@@ -1536,7 +1536,7 @@ itd_link_urb (
+ 					struct ehci_itd, itd_list);
+ 			list_move_tail (&itd->itd_list, &stream->td_list);
+ 			itd->stream = iso_stream_get (stream);
+-			itd->urb = usb_get_urb (urb);
++			itd->urb = urb;
+ 			itd_init (ehci, stream, itd);
+ 		}
+ 
+@@ -1645,7 +1645,7 @@ itd_complete (
+ 	(void) disable_periodic(ehci);
+ 	ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--;
+ 
+-	if (unlikely (list_empty (&stream->td_list))) {
++	if (unlikely(list_is_singular(&stream->td_list))) {
+ 		ehci_to_hcd(ehci)->self.bandwidth_allocated
+ 				-= stream->bandwidth;
+ 		ehci_vdbg (ehci,
+@@ -1656,7 +1656,6 @@ itd_complete (
+ 	iso_stream_put (ehci, stream);
+ 
+ done:
+-	usb_put_urb(urb);
+ 	itd->urb = NULL;
+ 	if (ehci->clock_frame != itd->frame || itd->index[7] != -1) {
+ 		/* OK to recycle this ITD now. */
+@@ -1949,7 +1948,7 @@ sitd_link_urb (
+ 				struct ehci_sitd, sitd_list);
+ 		list_move_tail (&sitd->sitd_list, &stream->td_list);
+ 		sitd->stream = iso_stream_get (stream);
+-		sitd->urb = usb_get_urb (urb);
++		sitd->urb = urb;
+ 
+ 		sitd_patch(ehci, stream, sitd, sched, packet);
+ 		sitd_link (ehci, (next_uframe >> 3) % ehci->periodic_size,
+@@ -2034,7 +2033,7 @@ sitd_complete (
+ 	(void) disable_periodic(ehci);
+ 	ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--;
+ 
+-	if (list_empty (&stream->td_list)) {
++	if (list_is_singular(&stream->td_list)) {
+ 		ehci_to_hcd(ehci)->self.bandwidth_allocated
+ 				-= stream->bandwidth;
+ 		ehci_vdbg (ehci,
+@@ -2045,7 +2044,6 @@ sitd_complete (
+ 	iso_stream_put (ehci, stream);
+ 	/* OK to recycle this SITD now that its completion callback ran. */
+ done:
+-	usb_put_urb(urb);
+ 	sitd->urb = NULL;
+ 	sitd->stream = NULL;
+ 	list_move(&sitd->sitd_list, &stream->free_list);
+diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
+index cfaf1f0..4294e6e 100644
+--- a/drivers/usb/serial/cp2101.c
++++ b/drivers/usb/serial/cp2101.c
+@@ -79,6 +79,7 @@ static struct usb_device_id id_table [] = {
+ 	{ USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */
+ 	{ USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */
+ 	{ USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */
++	{ USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */
+ 	{ USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */
+ 	{ USB_DEVICE(0x10C4, 0x81AC) }, /* MSD Dash Hawk */
+ 	{ USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */
+diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
+index fb6f293..aa21adb 100644
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -660,6 +660,11 @@ static struct usb_device_id id_table_combined [] = {
+ 	{ USB_DEVICE(PAPOUCH_VID, PAPOUCH_QUIDO4x4_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DGQG_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_DOMINTELL_DUSB_PID) },
++	{ USB_DEVICE(ATMEL_VID, STK541_PID) },
++	{ USB_DEVICE(DE_VID, STB_PID) },
++	{ USB_DEVICE(DE_VID, WHT_PID) },
++	{ USB_DEVICE(ADI_VID, ADI_GNICE_PID),
++		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+ 	{ },					/* Optional parameter entry */
+ 	{ }					/* Terminating entry */
+ };
+diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
+index 373ee09..171a97c 100644
+--- a/drivers/usb/serial/ftdi_sio.h
++++ b/drivers/usb/serial/ftdi_sio.h
+@@ -881,6 +881,26 @@
+ #define RATOC_PRODUCT_ID_USB60F	0xb020
+ 
+ /*
++ * Atmel STK541
++ */
++#define ATMEL_VID		0x03eb /* Vendor ID */
++#define STK541_PID		0x2109 /* Zigbee Controller */
++
++/*
++ * Dresden Elektronic Sensor Terminal Board
++ */
++#define DE_VID			0x1cf1 /* Vendor ID */
++#define STB_PID			0x0001 /* Sensor Terminal Board */
++#define WHT_PID			0x0004 /* Wireless Handheld Terminal */
++
++/*
++ * Blackfin gnICE JTAG
++ * http://docs.blackfin.uclinux.org/doku.php?id=hw:jtag:gnice
++ */
++#define ADI_VID 		0x0456
++#define ADI_GNICE_PID 		0xF000
++
++/*
+  *   BmRequestType:  1100 0000b
+  *   bRequest:       FTDI_E2_READ
+  *   wValue:         0
+diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
+index 5c3da3f..be88c84 100644
+--- a/drivers/usb/serial/option.c
++++ b/drivers/usb/serial/option.c
+@@ -89,6 +89,7 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po
+ #define OPTION_PRODUCT_ETNA_MODEM_GT		0x7041
+ #define OPTION_PRODUCT_ETNA_MODEM_EX		0x7061
+ #define OPTION_PRODUCT_ETNA_KOI_MODEM		0x7100
++#define OPTION_PRODUCT_GTM380_MODEM		0x7201
+ 
+ #define HUAWEI_VENDOR_ID			0x12D1
+ #define HUAWEI_PRODUCT_E600			0x1001
+@@ -190,6 +191,7 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po
+ /* OVATION PRODUCTS */
+ #define NOVATELWIRELESS_PRODUCT_MC727		0x4100
+ #define NOVATELWIRELESS_PRODUCT_MC950D		0x4400
++#define NOVATELWIRELESS_PRODUCT_U727		0x5010
+ 
+ /* FUTURE NOVATEL PRODUCTS */
+ #define NOVATELWIRELESS_PRODUCT_EVDO_FULLSPEED	0X6000
+@@ -281,14 +283,11 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po
+ 
+ /* ZTE PRODUCTS */
+ #define ZTE_VENDOR_ID				0x19d2
++#define ZTE_PRODUCT_MF622			0x0001
+ #define ZTE_PRODUCT_MF628			0x0015
+ #define ZTE_PRODUCT_MF626			0x0031
+ #define ZTE_PRODUCT_CDMA_TECH			0xfffe
+ 
+-/* Ericsson products */
+-#define ERICSSON_VENDOR_ID			0x0bdb
+-#define ERICSSON_PRODUCT_F3507G			0x1900
+-
+ #define BENQ_VENDOR_ID				0x04a5
+ #define BENQ_PRODUCT_H10			0x4068
+ 
+@@ -317,6 +316,7 @@ static struct usb_device_id option_ids[] = {
+ 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_GT) },
+ 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_EX) },
+ 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_MODEM) },
++	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GTM380_MODEM) },
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600, 0xff, 0xff, 0xff) },
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220, 0xff, 0xff, 0xff) },
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS, 0xff, 0xff, 0xff) },
+@@ -402,6 +402,7 @@ static struct usb_device_id option_ids[] = {
+ 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) }, /* Novatel EU850D/EU860D/EU870D */
+ 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) }, /* Novatel MC930D/MC950D */
+ 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) }, /* Novatel MC727/U727/USB727 */
++	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U727) }, /* Novatel MC727/U727/USB727 */
+ 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_FULLSPEED) }, /* Novatel EVDO product */
+ 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED) }, /* Novatel HSPA product */
+ 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED) }, /* Novatel EVDO Embedded product */
+@@ -429,7 +430,6 @@ static struct usb_device_id option_ids[] = {
+ 	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_CINGULAR) },	/* Dell Wireless HSDPA 5520 == Novatel Expedite EU860D */
+ 	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_L) },	/* Dell Wireless HSDPA 5520 */
+ 	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_I) },	/* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */
+-	{ USB_DEVICE(DELL_VENDOR_ID, 0x8147) },					/* Dell Wireless 5530 Mobile Broadband (3G HSPA) Mini-Card */
+ 	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_SPRINT) },	/* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */
+ 	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_TELUS) },	/* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */
+ 	{ USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_VZW) }, 	/* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */
+@@ -497,10 +497,10 @@ static struct usb_device_id option_ids[] = {
+ 	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
+ 	{ USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */
+ 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) },
++	{ USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622) },
+ 	{ USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626) },
+ 	{ USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) },
+ 	{ USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) },
+-	{ USB_DEVICE(ERICSSON_VENDOR_ID, ERICSSON_PRODUCT_F3507G) },
+ 	{ USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
+ 	{ USB_DEVICE(0x1da5, 0x4515) }, /* BenQ H20 */
+ 	{ } /* Terminating entry */
+diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
+index 781d581..f89549f 100644
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -219,7 +219,7 @@ UNUSUAL_DEV(  0x0421, 0x047c, 0x0370, 0x0610,
+ 		US_FL_MAX_SECTORS_64 ),
+ 
+ /* Reported by Manuel Osdoba <manuel.osdoba@××××××××××.de> */
+-UNUSUAL_DEV( 0x0421, 0x0492, 0x0452, 0x0452,
++UNUSUAL_DEV( 0x0421, 0x0492, 0x0452, 0x9999,
+ 		"Nokia",
+ 		"Nokia 6233",
+ 		US_SC_DEVICE, US_PR_DEVICE, NULL,
+@@ -913,7 +913,9 @@ UNUSUAL_DEV( 0x066f, 0x8000, 0x0001, 0x0001,
+ 		US_FL_FIX_CAPACITY ),
+ 
+ /* Reported by Richard -=[]=- <micro_flyer@×××××××.com> */
+-UNUSUAL_DEV( 0x067b, 0x2507, 0x0100, 0x0100,
++/* Change to bcdDeviceMin (0x0100 to 0x0001) reported by
++ * Thomas Bartosik <tbartdev@×××××××××××.de> */
++UNUSUAL_DEV( 0x067b, 0x2507, 0x0001, 0x0100,
+ 		"Prolific Technology Inc.",
+ 		"Mass Storage Device",
+ 		US_SC_DEVICE, US_PR_DEVICE, NULL,
+@@ -1328,6 +1330,16 @@ UNUSUAL_DEV( 0x0af0, 0x7401, 0x0000, 0x0000,
+ 		US_SC_DEVICE, US_PR_DEVICE, NULL,
+ 		0 ),
+ 
++/* Reported by Jan Dumon <j.dumon@××××××.com>
++ * This device (wrongly) has a vendor-specific device descriptor.
++ * The entry is needed so usb-storage can bind to it's mass-storage
++ * interface as an interface driver */
++UNUSUAL_DEV( 0x0af0, 0x7501, 0x0000, 0x0000,
++		"Option",
++		"GI 0431 SD-Card",
++		US_SC_DEVICE, US_PR_DEVICE, NULL,
++		0 ),
++
+ #ifdef CONFIG_USB_STORAGE_ISD200
+ UNUSUAL_DEV(  0x0bf6, 0xa001, 0x0100, 0x0110,
+ 		"ATI",
+diff --git a/fs/aio.c b/fs/aio.c
+index 048648d..c1174b5 100644
+--- a/fs/aio.c
++++ b/fs/aio.c
+@@ -428,7 +428,7 @@ static struct kiocb *__aio_get_req(struct kioctx *ctx)
+ 	req->private = NULL;
+ 	req->ki_iovec = NULL;
+ 	INIT_LIST_HEAD(&req->ki_run_list);
+-	req->ki_eventfd = ERR_PTR(-EINVAL);
++	req->ki_eventfd = NULL;
+ 
+ 	/* Check if the completion queue has enough free space to
+ 	 * accept an event from this io.
+@@ -470,8 +470,6 @@ static inline void really_put_req(struct kioctx *ctx, struct kiocb *req)
+ {
+ 	assert_spin_locked(&ctx->ctx_lock);
+ 
+-	if (!IS_ERR(req->ki_eventfd))
+-		fput(req->ki_eventfd);
+ 	if (req->ki_dtor)
+ 		req->ki_dtor(req);
+ 	if (req->ki_iovec != &req->ki_inline_vec)
+@@ -493,8 +491,11 @@ static void aio_fput_routine(struct work_struct *data)
+ 		list_del(&req->ki_list);
+ 		spin_unlock_irq(&fput_lock);
+ 
+-		/* Complete the fput */
+-		__fput(req->ki_filp);
++		/* Complete the fput(s) */
++		if (req->ki_filp != NULL)
++			__fput(req->ki_filp);
++		if (req->ki_eventfd != NULL)
++			__fput(req->ki_eventfd);
+ 
+ 		/* Link the iocb into the context's free list */
+ 		spin_lock_irq(&ctx->ctx_lock);
+@@ -512,12 +513,14 @@ static void aio_fput_routine(struct work_struct *data)
+  */
+ static int __aio_put_req(struct kioctx *ctx, struct kiocb *req)
+ {
++	int schedule_putreq = 0;
++
+ 	dprintk(KERN_DEBUG "aio_put(%p): f_count=%ld\n",
+ 		req, atomic_long_read(&req->ki_filp->f_count));
+ 
+ 	assert_spin_locked(&ctx->ctx_lock);
+ 
+-	req->ki_users --;
++	req->ki_users--;
+ 	BUG_ON(req->ki_users < 0);
+ 	if (likely(req->ki_users))
+ 		return 0;
+@@ -525,10 +528,23 @@ static int __aio_put_req(struct kioctx *ctx, struct kiocb *req)
+ 	req->ki_cancel = NULL;
+ 	req->ki_retry = NULL;
+ 
+-	/* Must be done under the lock to serialise against cancellation.
+-	 * Call this aio_fput as it duplicates fput via the fput_work.
++	/*
++	 * Try to optimize the aio and eventfd file* puts, by avoiding to
++	 * schedule work in case it is not __fput() time. In normal cases,
++	 * we would not be holding the last reference to the file*, so
++	 * this function will be executed w/out any aio kthread wakeup.
+ 	 */
+-	if (unlikely(atomic_long_dec_and_test(&req->ki_filp->f_count))) {
++	if (unlikely(atomic_long_dec_and_test(&req->ki_filp->f_count)))
++		schedule_putreq++;
++	else
++		req->ki_filp = NULL;
++	if (req->ki_eventfd != NULL) {
++		if (unlikely(atomic_long_dec_and_test(&req->ki_eventfd->f_count)))
++			schedule_putreq++;
++		else
++			req->ki_eventfd = NULL;
++	}
++	if (unlikely(schedule_putreq)) {
+ 		get_ioctx(ctx);
+ 		spin_lock(&fput_lock);
+ 		list_add(&req->ki_list, &fput_head);
+@@ -992,7 +1008,7 @@ int aio_complete(struct kiocb *iocb, long res, long res2)
+ 	 * eventfd. The eventfd_signal() function is safe to be called
+ 	 * from IRQ context.
+ 	 */
+-	if (!IS_ERR(iocb->ki_eventfd))
++	if (iocb->ki_eventfd != NULL)
+ 		eventfd_signal(iocb->ki_eventfd, 1);
+ 
+ put_rq:
+@@ -1596,6 +1612,7 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
+ 		req->ki_eventfd = eventfd_fget((int) iocb->aio_resfd);
+ 		if (IS_ERR(req->ki_eventfd)) {
+ 			ret = PTR_ERR(req->ki_eventfd);
++			req->ki_eventfd = NULL;
+ 			goto out_put_req;
+ 		}
+ 	}
+diff --git a/fs/ecryptfs/crypto.c b/fs/ecryptfs/crypto.c
+index 6046239..50b0a30 100644
+--- a/fs/ecryptfs/crypto.c
++++ b/fs/ecryptfs/crypto.c
+@@ -1310,14 +1310,13 @@ static int ecryptfs_write_headers_virt(char *page_virt, size_t max,
+ }
+ 
+ static int
+-ecryptfs_write_metadata_to_contents(struct ecryptfs_crypt_stat *crypt_stat,
+-				    struct dentry *ecryptfs_dentry,
+-				    char *virt)
++ecryptfs_write_metadata_to_contents(struct dentry *ecryptfs_dentry,
++				    char *virt, size_t virt_len)
+ {
+ 	int rc;
+ 
+ 	rc = ecryptfs_write_lower(ecryptfs_dentry->d_inode, virt,
+-				  0, crypt_stat->num_header_bytes_at_front);
++				  0, virt_len);
+ 	if (rc)
+ 		printk(KERN_ERR "%s: Error attempting to write header "
+ 		       "information to lower file; rc = [%d]\n", __func__,
+@@ -1327,7 +1326,6 @@ ecryptfs_write_metadata_to_contents(struct ecryptfs_crypt_stat *crypt_stat,
+ 
+ static int
+ ecryptfs_write_metadata_to_xattr(struct dentry *ecryptfs_dentry,
+-				 struct ecryptfs_crypt_stat *crypt_stat,
+ 				 char *page_virt, size_t size)
+ {
+ 	int rc;
+@@ -1337,6 +1335,17 @@ ecryptfs_write_metadata_to_xattr(struct dentry *ecryptfs_dentry,
+ 	return rc;
+ }
+ 
++static unsigned long ecryptfs_get_zeroed_pages(gfp_t gfp_mask,
++					       unsigned int order)
++{
++	struct page *page;
++
++	page = alloc_pages(gfp_mask | __GFP_ZERO, order);
++	if (page)
++		return (unsigned long) page_address(page);
++	return 0;
++}
++
+ /**
+  * ecryptfs_write_metadata
+  * @ecryptfs_dentry: The eCryptfs dentry
+@@ -1353,7 +1362,9 @@ int ecryptfs_write_metadata(struct dentry *ecryptfs_dentry)
+ {
+ 	struct ecryptfs_crypt_stat *crypt_stat =
+ 		&ecryptfs_inode_to_private(ecryptfs_dentry->d_inode)->crypt_stat;
++	unsigned int order;
+ 	char *virt;
++	size_t virt_len;
+ 	size_t size = 0;
+ 	int rc = 0;
+ 
+@@ -1369,33 +1380,35 @@ int ecryptfs_write_metadata(struct dentry *ecryptfs_dentry)
+ 		rc = -EINVAL;
+ 		goto out;
+ 	}
++	virt_len = crypt_stat->num_header_bytes_at_front;
++	order = get_order(virt_len);
+ 	/* Released in this function */
+-	virt = (char *)get_zeroed_page(GFP_KERNEL);
++	virt = (char *)ecryptfs_get_zeroed_pages(GFP_KERNEL, order);
+ 	if (!virt) {
+ 		printk(KERN_ERR "%s: Out of memory\n", __func__);
+ 		rc = -ENOMEM;
+ 		goto out;
+ 	}
+-	rc = ecryptfs_write_headers_virt(virt, PAGE_CACHE_SIZE, &size,
+-					 crypt_stat, ecryptfs_dentry);
++	rc = ecryptfs_write_headers_virt(virt, virt_len, &size, crypt_stat,
++					 ecryptfs_dentry);
+ 	if (unlikely(rc)) {
+ 		printk(KERN_ERR "%s: Error whilst writing headers; rc = [%d]\n",
+ 		       __func__, rc);
+ 		goto out_free;
+ 	}
+ 	if (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR)
+-		rc = ecryptfs_write_metadata_to_xattr(ecryptfs_dentry,
+-						      crypt_stat, virt, size);
++		rc = ecryptfs_write_metadata_to_xattr(ecryptfs_dentry, virt,
++						      size);
+ 	else
+-		rc = ecryptfs_write_metadata_to_contents(crypt_stat,
+-							 ecryptfs_dentry, virt);
++		rc = ecryptfs_write_metadata_to_contents(ecryptfs_dentry, virt,
++							 virt_len);
+ 	if (rc) {
+ 		printk(KERN_ERR "%s: Error writing metadata out to lower file; "
+ 		       "rc = [%d]\n", __func__, rc);
+ 		goto out_free;
+ 	}
+ out_free:
+-	free_page((unsigned long)virt);
++	free_pages((unsigned long)virt, order);
+ out:
+ 	return rc;
+ }
+diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
+index afcdf4b..cc76b64 100644
+--- a/fs/nfsd/nfs4xdr.c
++++ b/fs/nfsd/nfs4xdr.c
+@@ -2598,6 +2598,7 @@ static nfsd4_enc nfsd4_enc_ops[] = {
+ 	[OP_LOOKUPP]		= (nfsd4_enc)nfsd4_encode_noop,
+ 	[OP_NVERIFY]		= (nfsd4_enc)nfsd4_encode_noop,
+ 	[OP_OPEN]		= (nfsd4_enc)nfsd4_encode_open,
++	[OP_OPENATTR]		= (nfsd4_enc)nfsd4_encode_noop,
+ 	[OP_OPEN_CONFIRM]	= (nfsd4_enc)nfsd4_encode_open_confirm,
+ 	[OP_OPEN_DOWNGRADE]	= (nfsd4_enc)nfsd4_encode_open_downgrade,
+ 	[OP_PUTFH]		= (nfsd4_enc)nfsd4_encode_noop,
+diff --git a/include/linux/capability.h b/include/linux/capability.h
+index 9d1fe30..28863f4 100644
+--- a/include/linux/capability.h
++++ b/include/linux/capability.h
+@@ -382,8 +382,10 @@ typedef struct kernel_cap_struct {
+ # define CAP_FULL_SET     ((kernel_cap_t){{ ~0, ~0 }})
+ # define CAP_INIT_EFF_SET ((kernel_cap_t){{ ~CAP_TO_MASK(CAP_SETPCAP), ~0 }})
+ # define CAP_FS_SET       ((kernel_cap_t){{ CAP_FS_MASK_B0, CAP_FS_MASK_B1 } })
+-# define CAP_NFSD_SET     ((kernel_cap_t){{ CAP_FS_MASK_B0|CAP_TO_MASK(CAP_SYS_RESOURCE), \
+-					CAP_FS_MASK_B1 } })
++# define CAP_NFSD_SET     ((kernel_cap_t){{ CAP_FS_MASK_B0 \
++					    | CAP_TO_MASK(CAP_SYS_RESOURCE) \
++					    | CAP_TO_MASK(CAP_MKNOD), \
++					    CAP_FS_MASK_B1 } })
+ 
+ #endif /* _KERNEL_CAPABILITY_U32S != 2 */
+ 
+diff --git a/init/Kconfig b/init/Kconfig
+index f763762..83b6905 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -538,6 +538,9 @@ config CC_OPTIMIZE_FOR_SIZE
+ config SYSCTL
+ 	bool
+ 
++config ANON_INODES
++	bool
++
+ menuconfig EMBEDDED
+ 	bool "Configure standard kernel features (for small systems)"
+ 	help
+@@ -643,18 +646,6 @@ config PCSPKR_PLATFORM
+           This option allows to disable the internal PC-Speaker
+           support, saving some memory.
+ 
+-config COMPAT_BRK
+-	bool "Disable heap randomization"
+-	default y
+-	help
+-	  Randomizing heap placement makes heap exploits harder, but it
+-	  also breaks ancient binaries (including anything libc5 based).
+-	  This option changes the bootup default to heap randomization
+-	  disabled, and can be overriden runtime by setting
+-	  /proc/sys/kernel/randomize_va_space to 2.
+-
+-	  On non-ancient distros (post-2000 ones) N is usually a safe choice.
+-
+ config BASE_FULL
+ 	default y
+ 	bool "Enable full-sized data structures for core" if EMBEDDED
+@@ -672,9 +663,6 @@ config FUTEX
+ 	  support for "fast userspace mutexes".  The resulting kernel may not
+ 	  run glibc-based applications correctly.
+ 
+-config ANON_INODES
+-	bool
+-
+ config EPOLL
+ 	bool "Enable eventpoll support" if EMBEDDED
+ 	default y
+@@ -760,6 +748,18 @@ config SLUB_DEBUG
+ 	  SLUB sysfs support. /sys/slab will not exist and there will be
+ 	  no support for cache validation etc.
+ 
++config COMPAT_BRK
++	bool "Disable heap randomization"
++	default y
++	help
++	  Randomizing heap placement makes heap exploits harder, but it
++	  also breaks ancient binaries (including anything libc5 based).
++	  This option changes the bootup default to heap randomization
++	  disabled, and can be overriden runtime by setting
++	  /proc/sys/kernel/randomize_va_space to 2.
++
++	  On non-ancient distros (post-2000 ones) N is usually a safe choice.
++
+ choice
+ 	prompt "Choose SLAB allocator"
+ 	default SLUB
+diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
+index e178366..f04ff35 100644
+--- a/sound/core/oss/pcm_oss.c
++++ b/sound/core/oss/pcm_oss.c
+@@ -2872,7 +2872,7 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry,
+ 			setup = kmalloc(sizeof(*setup), GFP_KERNEL);
+ 			if (! setup) {
+ 				buffer->error = -ENOMEM;
+-				mutex_lock(&pstr->oss.setup_mutex);
++				mutex_unlock(&pstr->oss.setup_mutex);
+ 				return;
+ 			}
+ 			if (pstr->oss.setup_list == NULL)
+@@ -2886,7 +2886,7 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry,
+ 			if (! template.task_name) {
+ 				kfree(setup);
+ 				buffer->error = -ENOMEM;
+-				mutex_lock(&pstr->oss.setup_mutex);
++				mutex_unlock(&pstr->oss.setup_mutex);
+ 				return;
+ 			}
+ 		}
+diff --git a/sound/core/sgbuf.c b/sound/core/sgbuf.c
+index d4564ed..4e7ec2b 100644
+--- a/sound/core/sgbuf.c
++++ b/sound/core/sgbuf.c
+@@ -38,6 +38,10 @@ int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab)
+ 	if (! sgbuf)
+ 		return -EINVAL;
+ 
++	if (dmab->area)
++		vunmap(dmab->area);
++	dmab->area = NULL;
++
+ 	tmpb.dev.type = SNDRV_DMA_TYPE_DEV;
+ 	tmpb.dev.dev = sgbuf->dev;
+ 	for (i = 0; i < sgbuf->pages; i++) {
+@@ -48,9 +52,6 @@ int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab)
+ 		tmpb.bytes = (sgbuf->table[i].addr & ~PAGE_MASK) << PAGE_SHIFT;
+ 		snd_dma_free_pages(&tmpb);
+ 	}
+-	if (dmab->area)
+-		vunmap(dmab->area);
+-	dmab->area = NULL;
+ 
+ 	kfree(sgbuf->table);
+ 	kfree(sgbuf->page_table);
+diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
+index 58c972b..b848d10 100644
+--- a/sound/isa/opl3sa2.c
++++ b/sound/isa/opl3sa2.c
+@@ -550,21 +550,27 @@ static int __devinit snd_opl3sa2_mixer(struct snd_card *card)
+ #ifdef CONFIG_PM
+ static int snd_opl3sa2_suspend(struct snd_card *card, pm_message_t state)
+ {
+-	struct snd_opl3sa2 *chip = card->private_data;
++	if (card) {
++		struct snd_opl3sa2 *chip = card->private_data;
+ 
+-	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+-	chip->wss->suspend(chip->wss);
+-	/* power down */
+-	snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D3);
++		snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
++		chip->wss->suspend(chip->wss);
++		/* power down */
++		snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D3);
++	}
+ 
+ 	return 0;
+ }
+ 
+ static int snd_opl3sa2_resume(struct snd_card *card)
+ {
+-	struct snd_opl3sa2 *chip = card->private_data;
++	struct snd_opl3sa2 *chip;
+ 	int i;
+ 
++	if (!card)
++		return 0;
++
++	chip = card->private_data;
+ 	/* power up */
+ 	snd_opl3sa2_write(chip, OPL3SA2_PM_CTRL, OPL3SA2_PM_D0);
+ 
+diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
+index 35722ec..34a5b69 100644
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -2063,26 +2063,31 @@ static int __devinit check_position_fix(struct azx *chip, int fix)
+ {
+ 	const struct snd_pci_quirk *q;
+ 
+-	/* Check VIA HD Audio Controller exist */
+-	if (chip->pci->vendor == PCI_VENDOR_ID_VIA &&
+-	    chip->pci->device == VIA_HDAC_DEVICE_ID) {
++	switch (fix) {
++	case POS_FIX_LPIB:
++	case POS_FIX_POSBUF:
++		return fix;
++	}
++
++	/* Check VIA/ATI HD Audio Controller exist */
++	switch (chip->driver_type) {
++	case AZX_DRIVER_VIA:
++	case AZX_DRIVER_ATI:
+ 		chip->via_dmapos_patch = 1;
+ 		/* Use link position directly, avoid any transfer problem. */
+ 		return POS_FIX_LPIB;
+ 	}
+ 	chip->via_dmapos_patch = 0;
+ 
+-	if (fix == POS_FIX_AUTO) {
+-		q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
+-		if (q) {
+-			printk(KERN_INFO
+-				    "hda_intel: position_fix set to %d "
+-				    "for device %04x:%04x\n",
+-				    q->value, q->subvendor, q->subdevice);
+-			return q->value;
+-		}
++	q = snd_pci_quirk_lookup(chip->pci, position_fix_list);
++	if (q) {
++		printk(KERN_INFO
++		       "hda_intel: position_fix set to %d "
++		       "for device %04x:%04x\n",
++		       q->value, q->subvendor, q->subdevice);
++		return q->value;
+ 	}
+-	return fix;
++	return POS_FIX_AUTO;
+ }
+ 
+ /*
+@@ -2208,9 +2213,17 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
+ 	gcap = azx_readw(chip, GCAP);
+ 	snd_printdd("chipset global capabilities = 0x%x\n", gcap);
+ 
++	/* ATI chips seems buggy about 64bit DMA addresses */
++	if (chip->driver_type == AZX_DRIVER_ATI)
++		gcap &= ~0x01;
++
+ 	/* allow 64bit DMA address if supported by H/W */
+ 	if ((gcap & 0x01) && !pci_set_dma_mask(pci, DMA_64BIT_MASK))
+ 		pci_set_consistent_dma_mask(pci, DMA_64BIT_MASK);
++	else {
++		pci_set_dma_mask(pci, DMA_32BIT_MASK);
++		pci_set_consistent_dma_mask(pci, DMA_32BIT_MASK);
++	}
+ 
+ 	/* read number of streams from GCAP register instead of using
+ 	 * hardcoded value
+diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
+index ae7601f..f342def 100644
+--- a/sound/pci/mixart/mixart.c
++++ b/sound/pci/mixart/mixart.c
+@@ -607,6 +607,7 @@ static int snd_mixart_hw_params(struct snd_pcm_substream *subs,
+ 	/* set the format to the board */
+ 	err = mixart_set_format(stream, format);
+ 	if(err < 0) {
++		mutex_unlock(&mgr->setup_mutex);
+ 		return err;
+ 	}
+ 

Deleted: genpatches-2.6/trunk/2.6.28/2705_i915-no-vblank-on-disabled-pipe.patch
===================================================================
--- genpatches-2.6/trunk/2.6.28/2705_i915-no-vblank-on-disabled-pipe.patch	2009-03-21 15:32:23 UTC (rev 1531)
+++ genpatches-2.6/trunk/2.6.28/2705_i915-no-vblank-on-disabled-pipe.patch	2009-03-24 02:08:56 UTC (rev 1532)
@@ -1,34 +0,0 @@
-From: Jesse Barnes <jbarnes@××××××××××××.org>
-Date: Thu, 8 Jan 2009 18:42:15 +0000 (-0800)
-Subject: drm/i915: don't enable vblanks on disabled pipes
-X-Git-Tag: v2.6.29-rc2~7^2~7
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=71e0ffa599f54058d9b8724b4b14d0486751681d
-
-drm/i915: don't enable vblanks on disabled pipes
-
-In some cases userland may be confused and try to wait on vblank events from
-pipes that aren't actually enabled.  We shouldn't allow this, so return
--EINVAL if the pipe isn't on.
-
-Signed-off-by: Jesse Barnes <jbarnes@××××××××××××.org>
-Signed-off-by: Eric Anholt <eric@××××××.net>
-Signed-off-by: Dave Airlie <airlied@×××××.ie>
----
-
-diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 0cadafb..6290219 100644
---- a/drivers/gpu/drm/i915/i915_irq.c
-+++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -411,6 +411,12 @@ int i915_enable_vblank(struct drm_device *dev, int pipe)
- {
- 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- 	unsigned long irqflags;
-+	int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
-+	u32 pipeconf;
-+
-+	pipeconf = I915_READ(pipeconf_reg);
-+	if (!(pipeconf & PIPEACONF_ENABLE))
-+		return -EINVAL;
- 
- 	spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
- 	if (IS_I965G(dev))

Deleted: genpatches-2.6/trunk/2.6.28/2710_i915-set-vblank-flag-correctly.patch
===================================================================
--- genpatches-2.6/trunk/2.6.28/2710_i915-set-vblank-flag-correctly.patch	2009-03-21 15:32:23 UTC (rev 1531)
+++ genpatches-2.6/trunk/2.6.28/2710_i915-set-vblank-flag-correctly.patch	2009-03-24 02:08:56 UTC (rev 1532)
@@ -1,69 +0,0 @@
-From: Jesse Barnes <jbarnes@××××××××××××.org>
-Date: Tue, 6 Jan 2009 18:21:24 +0000 (-0800)
-Subject: drm/i915: set vblank enabled flag correctly across IRQ install/uninstall
-X-Git-Tag: v2.6.29-rc2~7^2~6
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=dc1336ff4fe08ae7cfe8301bfd7f0b2cfd31d20a
-
-drm/i915: set vblank enabled flag correctly across IRQ install/uninstall
-
-In the absence of kernel mode setting, many drivers disable IRQs across VT
-switch.  The core DRM vblank code is missing a check for this case however;
-even after IRQ disable, the vblank code will still have the vblank_enabled
-flag set, so unless we track the fact that they're disabled at IRQ uninstall
-time, when we VT switch back in we won't actually re-enable them, which means
-any apps waiting on vblank before the switch will hang.
-
-This patch does that and also adds a sanity check to the wait condition to
-look for the irq_enabled flag in general, as well as adding a wakeup to the
-IRQ uninstall path.
-
-Fixes fdo bug #18879 with compiz hangs at VT switch.
-
-Signed-off-by: Jesse Barnes <jbarnes@××××××××××××.org>
-Signed-off-by: Eric Anholt <eric@××××××.net>
-Signed-off-by: Dave Airlie <airlied@×××××.ie>
----
-
-diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
-index 724e505..477caa1 100644
---- a/drivers/gpu/drm/drm_irq.c
-+++ b/drivers/gpu/drm/drm_irq.c
-@@ -267,7 +267,8 @@ EXPORT_SYMBOL(drm_irq_install);
-  */
- int drm_irq_uninstall(struct drm_device * dev)
- {
--	int irq_enabled;
-+	unsigned long irqflags;
-+	int irq_enabled, i;
- 
- 	if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
- 		return -EINVAL;
-@@ -277,6 +278,16 @@ int drm_irq_uninstall(struct drm_device * dev)
- 	dev->irq_enabled = 0;
- 	mutex_unlock(&dev->struct_mutex);
- 
-+	/*
-+	 * Wake up any waiters so they don't hang.
-+	 */
-+	spin_lock_irqsave(&dev->vbl_lock, irqflags);
-+	for (i = 0; i < dev->num_crtcs; i++) {
-+		DRM_WAKEUP(&dev->vbl_queue[i]);
-+		dev->vblank_enabled[i] = 0;
-+	}
-+	spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
-+
- 	if (!irq_enabled)
- 		return -EINVAL;
- 
-@@ -652,8 +663,9 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
- 			  vblwait->request.sequence, crtc);
- 		dev->last_vblank_wait[crtc] = vblwait->request.sequence;
- 		DRM_WAIT_ON(ret, dev->vbl_queue[crtc], 3 * DRM_HZ,
--			    ((drm_vblank_count(dev, crtc)
--			      - vblwait->request.sequence) <= (1 << 23)));
-+			    (((drm_vblank_count(dev, crtc) -
-+			       vblwait->request.sequence) <= (1 << 23)) ||
-+			     !dev->irq_enabled));
- 
- 		if (ret != -EINTR) {
- 			struct timeval now;

Added: genpatches-2.6/trunk/2.6.28/2910_makefile-cflags.patch
===================================================================
--- genpatches-2.6/trunk/2.6.28/2910_makefile-cflags.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.28/2910_makefile-cflags.patch	2009-03-24 02:08:56 UTC (rev 1532)
@@ -0,0 +1,12 @@
+--- a/Makefile	2009-03-23 21:50:02.000000000 -0400
++++ b/Makefile	2009-03-23 21:52:02.000000000 -0400
+@@ -555,6 +555,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wdecl
+ # disable pointer signed / unsigned warnings in gcc 4.0
+ KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,)
+ 
++# disable invalid "can't wrap" optimzations for signed / pointers
++KBUILD_CFLAGS	+= $(call cc-option,-fwrapv)
++
+ # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
+ # But warn user when we do so
+ warn-assign = \