Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[sfrench/cifs-2.6.git] / arch / i386 / kernel / cpu / cpufreq / speedstep-smi.c

diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c b/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
index 336ba49e526d9b7f9a1d670acb5c033baf5cc701..c28333d53646dd8854978ead3f196a274d645aaf 100644 (file)
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
@@ -75,7 +75,9 @@ static int speedstep_smi_ownership (void)
        __asm__ __volatile__(
                "out %%al, (%%dx)\n"
                : "=D" (result)
-               : "a" (command), "b" (function), "c" (0), "d" (smi_port), "D" (0), "S" (magic)
+               : "a" (command), "b" (function), "c" (0), "d" (smi_port),
+                       "D" (0), "S" (magic)
+               : "memory"
        );
 
        dprintk("result is %x\n", result);