From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 May 2010 15:49:13 +0000 (-0700)
Subject: Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.35-rc1~516
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=07d77759c95d899b84f8e473a01cff001019dd5f;p=safe%2Fjmp%2Flinux-2.6

Merge branch 'x86-cpu-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, hypervisor: add missing <linux/module.h>
  Modify the VMware balloon driver for the new x86_hyper API
  x86, hypervisor: Export the x86_hyper* symbols
  x86: Clean up the hypervisor layer
  x86, HyperV: fix up the license to mshyperv.c
  x86: Detect running on a Microsoft HyperV system
  x86, cpu: Make APERF/MPERF a normal table-driven flag
  x86, k8: Fix build error when K8_NB is disabled
  x86, cacheinfo: Disable index in all four subcaches
  x86, cacheinfo: Make L3 cache info per node
  x86, cacheinfo: Reorganize AMD L3 cache structure
  x86, cacheinfo: Turn off L3 cache index disable feature in virtualized environments
  x86, cacheinfo: Unify AMD L3 cache index disable checking
  cpufreq: Unify sysfs attribute definition macros
  powernow-k8: Fix frequency reporting
  x86, cpufreq: Add APERF/MPERF support for AMD processors
  x86: Unify APERF/MPERF support
  powernow-k8: Add core performance boost support
  x86, cpu: Add AMD core boosting feature flag to /proc/cpuinfo

Fix up trivial conflicts in arch/x86/kernel/cpu/intel_cacheinfo.c and
drivers/cpufreq/cpufreq_ondemand.c
---

07d77759c95d899b84f8e473a01cff001019dd5f
diff --cc drivers/cpufreq/cpufreq_ondemand.c
index 8e9dbdc,c00b25f..e131421
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@@ -406,15 -368,10 +398,11 @@@ static ssize_t store_powersave_bias(str
  	return count;
  }
  
- #define define_one_rw(_name) \
- static struct global_attr _name = \
- __ATTR(_name, 0644, show_##_name, store_##_name)
- 
- define_one_rw(sampling_rate);
- define_one_rw(io_is_busy);
- define_one_rw(up_threshold);
- define_one_rw(ignore_nice_load);
- define_one_rw(powersave_bias);
+ define_one_global_rw(sampling_rate);
++define_one_global_rw(io_is_busy);
+ define_one_global_rw(up_threshold);
+ define_one_global_rw(ignore_nice_load);
+ define_one_global_rw(powersave_bias);
  
  static struct attribute *dbs_attributes[] = {
  	&sampling_rate_max.attr,