diff options
author | Ingo Molnar | 2009-02-13 09:49:38 +0100 |
---|---|---|
committer | Ingo Molnar | 2009-02-13 09:49:38 +0100 |
commit | b1864e9a1afef41709886072c6e6248def0386f4 (patch) | |
tree | 2fe749209cf860c1dd10efd1bd2ad8df572bd66e /arch/x86/kernel/ioport.c | |
parent | Merge branch 'linus' into perfcounters/core (diff) | |
parent | Merge branches 'x86/paravirt', 'x86/pat', 'x86/setup-v2', 'x86/subarch', 'x86... (diff) | |
download | kernel-qcow2-linux-b1864e9a1afef41709886072c6e6248def0386f4.tar.gz kernel-qcow2-linux-b1864e9a1afef41709886072c6e6248def0386f4.tar.xz kernel-qcow2-linux-b1864e9a1afef41709886072c6e6248def0386f4.zip |
Merge branch 'x86/core' into perfcounters/core
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/apic.c
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'arch/x86/kernel/ioport.c')
-rw-r--r-- | arch/x86/kernel/ioport.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c index b12208f4dfee..e41980a373ab 100644 --- a/arch/x86/kernel/ioport.c +++ b/arch/x86/kernel/ioport.c @@ -131,9 +131,8 @@ static int do_iopl(unsigned int level, struct pt_regs *regs) } #ifdef CONFIG_X86_32 -asmlinkage long sys_iopl(unsigned long regsp) +long sys_iopl(struct pt_regs *regs) { - struct pt_regs *regs = (struct pt_regs *)®sp; unsigned int level = regs->bx; struct thread_struct *t = ¤t->thread; int rc; |