From ef4c6ef5e5aa82657436e53d3c6884fd6f777f96 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Wed, 9 Dec 2009 16:54:08 -0800
Subject: [PATCH] --- yaml --- r: 177365 b: refs/heads/master c:
 fc380ceed7fe469728ea4acdbda4495ea943ee1c h: refs/heads/master i:   177363:
 01c772be265818fbdcfe2649eba77609e58c7a30 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/ioport.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4d5666666d74..a6cb55ce4d63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce9119ad90b1caba550447bfcc0a21850558ca49
+refs/heads/master: fc380ceed7fe469728ea4acdbda4495ea943ee1c
diff --git a/trunk/arch/x86/kernel/ioport.c b/trunk/arch/x86/kernel/ioport.c
index 85ecc7c57ba6..8eec0ec59af2 100644
--- a/trunk/arch/x86/kernel/ioport.c
+++ b/trunk/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;
 }