1.1 --- a/xen/arch/x86/cpu/amd.c	Wed Jan 05 09:41:28 2011 +0000
     1.2 +++ b/xen/arch/x86/cpu/amd.c	Wed Jan 05 09:48:43 2011 +0000
     1.3 @@ -230,25 +230,6 @@ int cpu_has_amd_erratum(const struct cpu
     1.4  	return 0;
     1.5  }
     1.6  
     1.7 -/*
     1.8 - * amd_flush_filter={on,off}. Forcibly Enable or disable the TLB flush
     1.9 - * filter on AMD 64-bit processors.
    1.10 - */
    1.11 -static s8 __devinit flush_filter_force;
    1.12 -static void __init flush_filter(char *s)
    1.13 -{
    1.14 -	switch (parse_bool(s))
    1.15 -	{
    1.16 -	case 0:
    1.17 -		flush_filter_force = -1;
    1.18 -		break;
    1.19 -	case 1:
    1.20 -		flush_filter_force = 1;
    1.21 -		break;
    1.22 -	}
    1.23 -}
    1.24 -custom_param("amd_flush_filter", flush_filter);
    1.25 -
    1.26  #define num_physpages 0
    1.27  
    1.28  /*
    1.29 @@ -543,21 +524,6 @@ static void __devinit init_amd(struct cp
    1.30  		break;
    1.31  	}
    1.32  
    1.33 -	if (c->x86 == 15) {
    1.34 -		rdmsr(MSR_K7_HWCR, l, h);
    1.35 -		printk(KERN_INFO "CPU%d: AMD Flush Filter %sabled",
    1.36 -		       smp_processor_id(), (l & (1<<6)) ? "dis" : "en");
    1.37 -		if ((flush_filter_force > 0) && (l & (1<<6))) {
    1.38 -			l &= ~(1<<6);
    1.39 -			printk(" -> Forcibly enabled");
    1.40 -		} else if ((flush_filter_force < 0) && !(l & (1<<6))) {
    1.41 -			l |= 1<<6;
    1.42 -			printk(" -> Forcibly disabled");
    1.43 -		}
    1.44 -		wrmsr(MSR_K7_HWCR, l, h);
    1.45 -		printk("\n");
    1.46 -	}
    1.47 -
    1.48  	display_cacheinfo(c);
    1.49  
    1.50  	if (cpuid_eax(0x80000000) >= 0x80000008) {