From: Stephen Warren <swarren@nvidia.com>
Date: Wed, 14 Nov 2012 20:31:05 +0000 (-0700)
Subject: Merge branch 'for-3.8/cpuidle' into for-next
X-Git-Tag: next-20121115~15^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2d95fb866d058022cae2049366c2fb7b0925f01c;p=karo-tx-linux.git

Merge branch 'for-3.8/cpuidle' into for-next
---

2d95fb866d058022cae2049366c2fb7b0925f01c
diff --cc arch/arm/mach-tegra/common.c
index 3e03e5f15c14,c25746eedee5..11a74db51e5d
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@@ -121,9 -124,11 +124,11 @@@ static void __init tegra_init_cache(voi
  
  	cache_type = readl(p + L2X0_CACHE_TYPE);
  	aux_ctrl = (cache_type & 0x700) << (17-8);
 -	aux_ctrl |= 0x6C000001;
 +	aux_ctrl |= 0x7C400001;
  
- 	l2x0_of_init(aux_ctrl, 0x8200c3fe);
+ 	ret = l2x0_of_init(aux_ctrl, 0x8200c3fe);
+ 	if (!ret)
+ 		l2x0_saved_regs_addr = virt_to_phys(&l2x0_saved_regs);
  #endif
  
  }