commit 27f59559d63375a4d59e7c720a439d9f0b47edad
author Brian Gerst <brgerst@gmail.com> Wed Dec 09 19:01:52 2009 -0500
committer H. Peter Anvin <hpa@zytor.com> Wed Dec 09 16:28:10 2009 -0800
tree 7990a73f63b67ea6123f9be4767aad82911877c4
parent e258e4e0b495e6ecbd073d6bef1eafb62a58919a

x86: Merge sys_iopl

Change 32-bit sys_iopl to PTREGSCALL1, and merge with 64-bit.

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

arch/x86/kernel/entry_32.S

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 34dbfa9..ab7fcef 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -758,7 +758,7 @@
 	addl $4,%esp; \
 	ret
 
-PTREGSCALL0(iopl)
+PTREGSCALL1(iopl)
 PTREGSCALL0(fork)
 PTREGSCALL0(clone)
 PTREGSCALL0(vfork)