From bf717583738c3496c556adcc59129bef0f0f049f Mon Sep 17 00:00:00 2001
From: Jim Bos <jim876@xs4all.nl>
Date: Mon, 15 Nov 2010 21:22:37 +0100
Subject: [PATCH] --- yaml --- r: 222119 b: refs/heads/master c:
 22d3243de86bc92d874abb7c5b185d5c47aba323 h: refs/heads/master i:   222117:
 ab0e34aaba0b049be48d7617d5ef9cfe0f1e6930   222115:
 1a85fc833c907e7ebe014f71df4cb2ee445c6ec0   222111:
 61811375cb477e49c7a0960a39f3c720033321ae v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/char/i8k.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7d71405a64d4..9f49dcccae54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 620751a25964582595c6e7935777af954b24cb96
+refs/heads/master: 22d3243de86bc92d874abb7c5b185d5c47aba323
diff --git a/trunk/drivers/char/i8k.c b/trunk/drivers/char/i8k.c
index f0863bec186f..d72433f2d310 100644
--- a/trunk/drivers/char/i8k.c
+++ b/trunk/drivers/char/i8k.c
@@ -120,7 +120,7 @@ static int i8k_smm(struct smm_regs *regs)
 	int eax = regs->eax;
 
 #if defined(CONFIG_X86_64)
-	asm("pushq %%rax\n\t"
+	asm volatile("pushq %%rax\n\t"
 		"movl 0(%%rax),%%edx\n\t"
 		"pushq %%rdx\n\t"
 		"movl 4(%%rax),%%ebx\n\t"
@@ -142,11 +142,11 @@ static int i8k_smm(struct smm_regs *regs)
 		"lahf\n\t"
 		"shrl $8,%%eax\n\t"
 		"andl $1,%%eax\n"
-		:"=a"(rc), "+m" (*regs)
+		:"=a"(rc)
 		:    "a"(regs)
 		:    "%ebx", "%ecx", "%edx", "%esi", "%edi", "memory");
 #else
-	asm("pushl %%eax\n\t"
+	asm volatile("pushl %%eax\n\t"
 	    "movl 0(%%eax),%%edx\n\t"
 	    "push %%edx\n\t"
 	    "movl 4(%%eax),%%ebx\n\t"
@@ -168,7 +168,7 @@ static int i8k_smm(struct smm_regs *regs)
 	    "lahf\n\t"
 	    "shrl $8,%%eax\n\t"
 	    "andl $1,%%eax\n"
-	    :"=a"(rc), "+m" (*regs)
+	    :"=a"(rc)
 	    :    "a"(regs)
 	    :    "%ebx", "%ecx", "%edx", "%esi", "%edi", "memory");
 #endif