x86 fixes
Subsystems (3)
Linus,
Please pull the latest x86-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
Thanks,
Ingo
------------------>
Andreas Schwab (1):
x86 setup: fix asm constraints in vesa_store_edid
H. Peter Anvin (1):
x86: correct the CPUID pattern for MSR_IA32_MISC_ENABLE availability
Ingo Molnar (1):
x86: tone down mtrr_trim_uncached_memory() warning
Jeremy Fitzhardinge (1):
xen: make sysfs files behave as their names suggest
arch/x86/boot/video-vesa.c | 11 +++++------ arch/x86/kernel/cpu/intel.c | 2 +- arch/x86/kernel/cpu/mtrr/main.c | 3 +-- drivers/xen/balloon.c | 33 ++++++++++++++++++++++++++++++++- 4 files changed, 39 insertions(+), 10 deletions(-)
arch/x86/boot/video-vesa.c +5 -6
@@ -269,9 +269,8 @@ void vesa_store_edid(void)we genuinely have to assume all registers are destroyed here. */ asm("pushw %%es; movw %2,%%es; " INT10 "; popw %%es" - :"+a" (ax),"+b" (bx) - :"c" (cx),"D" (di) - :"esi" ); + :"+a" (ax),"+b" (bx),"+c" (cx),"+D" (di) + : :"esi" ,"edx" );if (ax !=0x004f )return ;/* No EDID */
@@ -285,9 +284,9 @@ void vesa_store_edid(void) dx =0 ;/* EDID block number */ di =(size_t ) &boot_params.edid_info;/* (ES:)Pointer to block */ asm(INT10 - : "+a" (ax), "+b" (bx), "+d" (dx), "=m" (boot_params.edid_info) - : "c" (cx), "D" (di) - : "esi"); + : "+a" (ax), "+b" (bx), "+d" (dx), "=m" (boot_params.edid_info), + "+c" (cx), "+D" (di) + : : "esi");#endif /* CONFIG_FIRMWARE_EDID */ }
arch/x86/kernel/cpu/intel.c +1 -1
@@ -30,7 +30,7 @@static void __cpuinit early_init_intel (struct cpuinfo_x86 *c) {/* Unmask CPUID levels if masked: */ -if (c->x86 ==6 && c->x86_model >=15 ) { +if (c->x86 >6 || (c->x86 ==6 && c->x86_model >=0xd )) {u64 misc_enable;rdmsrl (MSR_IA32_MISC_ENABLE , misc_enable);
arch/x86/kernel/cpu/mtrr/main.c +1 -2
@@ -1594,8 +1594,7 @@ int __init mtrr_trim_uncached_memory(unsigned long end_pfn)/* kvm/qemu doesn't have mtrr set right, don't trim them all */ if (!highest_pfn) { -WARN (!kvm_para_available (),KERN_WARNING -"WARNING: strange, CPU MTRRs all blank?\n" ); +printk (KERN_INFO "CPU MTRRs all blank - virtualized system.\n" );return 0 ; }
drivers/xen/balloon.c +32 -1
@@ -498,7 +498,7 @@ static ssize_t store_target_kb(struct sys_device *dev,if (!capable (CAP_SYS_ADMIN ))return -EPERM ; - target_bytes =memparse (buf, &endchar); + target_bytes =simple_strtoull (buf, &endchar,0 ) *1024 ;balloon_set_new_target (target_bytes >>PAGE_SHIFT );
@@ -508,8 +508,39 @@ static ssize_t store_target_kb(struct sys_device *dev, static SYSDEV_ATTR(target_kb, S_IRUGO | S_IWUSR, show_target_kb, store_target_kb); + +static ssize_t show_target (struct sys_device *dev,struct sysdev_attribute *attr, +char *buf) +{ +return sprintf (buf,"%llu\n" , + (u64 )balloon_stats.target_pages <<PAGE_SHIFT ); +} + +static ssize_t store_target (struct sys_device *dev, +struct sysdev_attribute *attr, +const char *buf, +size_t count) +{ +char *endchar; +unsigned long long target_bytes; + +if (!capable (CAP_SYS_ADMIN )) +return -EPERM ; + + target_bytes =memparse (buf, &endchar); + +balloon_set_new_target (target_bytes >>PAGE_SHIFT ); + +return count; +} + +static SYSDEV_ATTR(target, S_IRUGO | S_IWUSR, + show_target, store_target); + +static struct sysdev_attribute *balloon_attrs[] = { &attr_target_kb, + &attr_target, };static struct attribute *balloon_info_attrs[] = {