diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-11-19 08:04:25 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-19 08:04:25 (GMT) |
commit | fe040be2fdc49a4132c5f64359c629aeeb8e4947 (patch) | |
tree | 40323a8f05d3754372f561bb8f4698ef1a4e9c8f /drivers/char/i8k.c | |
parent | 2006920a18cc9f499e5cccf9e6f1aa9f6120705e (diff) | |
parent | 6722a4016d7f5f107a82ad71a3ee1ccec105532f (diff) | |
download | linux-fsl-qoriq-fe040be2fdc49a4132c5f64359c629aeeb8e4947.tar.xz |
Merge branch 'common/fbdev-mipi' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
Diffstat (limited to 'drivers/char/i8k.c')
-rw-r--r-- | drivers/char/i8k.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c index 3bc0eef..d72433f 100644 --- a/drivers/char/i8k.c +++ b/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" @@ -146,7 +146,7 @@ static int i8k_smm(struct smm_regs *regs) : "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" @@ -167,7 +167,8 @@ static int i8k_smm(struct smm_regs *regs) "movl %%edx,0(%%eax)\n\t" "lahf\n\t" "shrl $8,%%eax\n\t" - "andl $1,%%eax\n":"=a"(rc) + "andl $1,%%eax\n" + :"=a"(rc) : "a"(regs) : "%ebx", "%ecx", "%edx", "%esi", "%edi", "memory"); #endif |