From: H. Peter Anvin <hpa@zytor.com>
Date: Thu, 10 Dec 2009 00:54:08 +0000 (-0800)
Subject: x86-64, paravirt: Call set_iopl_mask() on 64 bits
X-Git-Tag: MMI-PSA29.97-13-9~25125^2~38^2~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fc380ceed7fe469728ea4acdbda4495ea943ee1c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

x86-64, paravirt: Call set_iopl_mask() on 64 bits

set_iopl_mask() is a no-op on 64 bits, but it is also a paravirt hook,
so call it even on 64 bits.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Brian Gerst <brgerst@gmail.com>
LKML-Reference: <1260403316-5679-3-git-send-email-brgerst@gmail.com>
---

diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
index 85ecc7c57ba6..8eec0ec59af2 100644
--- a/arch/x86/kernel/ioport.c
+++ b/arch/x86/kernel/ioport.c
@@ -116,10 +116,8 @@ long sys_iopl(unsigned int level, struct pt_regs *regs)
 			return -EPERM;
 	}
 	regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
-#ifdef CONFIG_X86_32
 	t->iopl = level << 12;
 	set_iopl_mask(t->iopl);
-#endif
 
 	return 0;
 }