From: Colin Cross <ccross@android.com>
Date: Sat, 8 Jan 2011 01:20:53 +0000 (-0800)
Subject: Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~71
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=351516118103c6c7bb5321aa9d5866eb3dc0d5ca;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36

Conflicts:
	arch/arm/mm/cache-v6.S

Change-Id: I1a2063218dd705a762a40f4a9dfe504ce1a1d491
---

351516118103c6c7bb5321aa9d5866eb3dc0d5ca
diff --cc arch/arm/mm/cache-v6.S
index ea0894f62e07,47010d8114b0..2528afc1248f
--- a/arch/arm/mm/cache-v6.S
+++ b/arch/arm/mm/cache-v6.S
@@@ -256,17 -264,12 +264,18 @@@ v6_dma_clean_range
   *	- end     - virtual end address of region
   */
  ENTRY(v6_dma_flush_range)
 +#ifdef CONFIG_CACHE_FLUSH_RANGE_LIMIT
 +	sub	r2, r1, r0
 +	cmp	r2, #CONFIG_CACHE_FLUSH_RANGE_LIMIT
 +	bhi	v6_dma_flush_dcache_all
 +#endif
- 	bic	r0, r0, #D_CACHE_LINE_SIZE - 1
- 1:
++
  #ifdef CONFIG_DMA_CACHE_RWFO
- 	ldr	r2, [r0]			@ read for ownership
- 	str	r2, [r0]			@ write for ownership
+ 	ldrb	r2, [r0]		@ read for ownership
+ 	strb	r2, [r0]		@ write for ownership
  #endif
+ 	bic	r0, r0, #D_CACHE_LINE_SIZE - 1
+ 1:
  #ifdef HARVARD_CACHE
  	mcr	p15, 0, r0, c7, c14, 1		@ clean & invalidate D line
  #else
diff --cc drivers/mmc/core/core.c
index 73e56f2da61f,994454295184..ad32bd77321f
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@@ -1779,12 -1720,9 +1779,13 @@@ int mmc_pm_notify(struct notifier_bloc
  
  	case PM_POST_SUSPEND:
  	case PM_POST_HIBERNATION:
+ 	case PM_POST_RESTORE:
  
  		spin_lock_irqsave(&host->lock, flags);
 +		if (mmc_bus_manual_resume(host)) {
 +			spin_unlock_irqrestore(&host->lock, flags);
 +			break;
 +		}
  		host->rescan_disable = 0;
  		spin_unlock_irqrestore(&host->lock, flags);
  		mmc_detect_change(host, 0);