From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 24 Mar 2012 19:20:25 +0000 (-0700)
Subject: Merge tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e22057c8599373e5caef0bc42bdb95d2a361ab0d;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'stable/for-linus-3.4-tag-two' of git://git./linux/kernel/git/konrad/xen

Pull more xen updates from Konrad Rzeszutek Wilk:
 "One tiny feature that accidentally got lost in the initial git pull:
   * Add fast-EOI acking of interrupts (clear a bit instead of
     hypercall)
  And bug-fixes:
   * Fix CPU bring-up code missing a call to notify other subsystems.
   * Fix reading /sys/hypervisor even if PVonHVM drivers are not loaded.
   * In Xen ACPI processor driver: remove too verbose WARN messages, fix
     up the Kconfig dependency to be a module by default, and add
     dependency on CPU_FREQ.
   * Disable CPU frequency drivers from loading when booting under Xen
     (as we want the Xen ACPI processor to be used instead).
   * Cleanups in tmem code."

* tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/acpi: Fix Kconfig dependency on CPU_FREQ
  xen: initialize platform-pci even if xen_emul_unplug=never
  xen/smp: Fix bringup bug in AP code.
  xen/acpi: Remove the WARN's as they just create noise.
  xen/tmem: cleanup
  xen: support pirq_eoi_map
  xen/acpi-processor: Do not depend on CPU frequency scaling drivers.
  xen/cpufreq: Disable the cpu frequency scaling drivers from loading.
  provide disable_cpufreq() function to disable the API.
---

e22057c8599373e5caef0bc42bdb95d2a361ab0d
diff --cc drivers/xen/tmem.c
index 17d9e37beba4,6a8f76dd5a22..dcb79521e6c8
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@@ -233,18 -230,17 +230,17 @@@ static bool __initdata use_cleancache 
  
  static int __init no_cleancache(char *s)
  {
- 	use_cleancache = 0;
+ 	use_cleancache = false;
  	return 1;
  }
- 
  __setup("nocleancache", no_cleancache);
  
- static struct cleancache_ops tmem_cleancache_ops = {
+ static struct cleancache_ops __initdata tmem_cleancache_ops = {
  	.put_page = tmem_cleancache_put_page,
  	.get_page = tmem_cleancache_get_page,
 -	.flush_page = tmem_cleancache_flush_page,
 -	.flush_inode = tmem_cleancache_flush_inode,
 -	.flush_fs = tmem_cleancache_flush_fs,
 +	.invalidate_page = tmem_cleancache_flush_page,
 +	.invalidate_inode = tmem_cleancache_flush_inode,
 +	.invalidate_fs = tmem_cleancache_flush_fs,
  	.init_shared_fs = tmem_cleancache_init_shared_fs,
  	.init_fs = tmem_cleancache_init_fs
  };
@@@ -360,17 -356,16 +356,16 @@@ static bool __initdata use_frontswap = 
  
  static int __init no_frontswap(char *s)
  {
- 	use_frontswap = 0;
+ 	use_frontswap = false;
  	return 1;
  }
- 
  __setup("nofrontswap", no_frontswap);
  
- static struct frontswap_ops tmem_frontswap_ops = {
+ static struct frontswap_ops __initdata tmem_frontswap_ops = {
  	.put_page = tmem_frontswap_put_page,
  	.get_page = tmem_frontswap_get_page,
 -	.flush_page = tmem_frontswap_flush_page,
 -	.flush_area = tmem_frontswap_flush_area,
 +	.invalidate_page = tmem_frontswap_flush_page,
 +	.invalidate_area = tmem_frontswap_flush_area,
  	.init = tmem_frontswap_init
  };
  #endif