From: Linus Torvalds Date: Thu, 23 Oct 2008 19:38:39 +0000 (-0700) Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v2.6.28-rc1~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3c9897c63ebb0b93b7f78724e38d6ee1da04041;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix section mismatch warning - apic_x2apic_phys x86: fix section mismatch warning - apic_x2apic_cluster x86: fix section mismatch warning - apic_x2apic_uv_x x86: fix section mismatch warning - apic_physflat x86: fix section mismatch warning - apic_flat x86: memtest fix use of reserve_early() x86 syscall.h: fix argument order x86/tlb_uv: remove strange mc146818rtc include x86: remove redundant KERN_DEBUG on pr_debug x86: do_boot_cpu - check if we have ESR register x86: MAINTAINERS change for AMD microcode patch loader x86/proc: fix /proc/cpuinfo cpu offline bug x86: call dmi-quirks for HP Laptops after early-quirks are executed x86, kexec: fix hang on i386 when panic occurs while console_sem is held MCE: Don't run 32bit machine checks with interrupts on x86: SB600: skip IRQ0 override if it is not routed to INT2 of IOAPIC x86: make variables static --- c3c9897c63ebb0b93b7f78724e38d6ee1da04041 diff --cc arch/x86/include/asm/syscall.h index 1d88f69,0000000..d82f39b mode 100644,000000..100644 --- a/arch/x86/include/asm/syscall.h +++ b/arch/x86/include/asm/syscall.h @@@ -1,211 -1,0 +1,213 @@@ +/* + * Access to user system call parameters and results + * + * Copyright (C) 2008 Red Hat, Inc. All rights reserved. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU General Public License v.2. + * + * See asm-generic/syscall.h for descriptions of what we must do here. + */ + +#ifndef _ASM_X86_SYSCALL_H +#define _ASM_X86_SYSCALL_H + +#include +#include + +static inline long syscall_get_nr(struct task_struct *task, + struct pt_regs *regs) +{ + /* + * We always sign-extend a -1 value being set here, + * so this is always either -1L or a syscall number. + */ + return regs->orig_ax; +} + +static inline void syscall_rollback(struct task_struct *task, + struct pt_regs *regs) +{ + regs->ax = regs->orig_ax; +} + +static inline long syscall_get_error(struct task_struct *task, + struct pt_regs *regs) +{ + unsigned long error = regs->ax; +#ifdef CONFIG_IA32_EMULATION + /* + * TS_COMPAT is set for 32-bit syscall entries and then + * remains set until we return to user mode. + */ + if (task_thread_info(task)->status & TS_COMPAT) + /* + * Sign-extend the value so (int)-EFOO becomes (long)-EFOO + * and will match correctly in comparisons. + */ + error = (long) (int) error; +#endif + return IS_ERR_VALUE(error) ? error : 0; +} + +static inline long syscall_get_return_value(struct task_struct *task, + struct pt_regs *regs) +{ + return regs->ax; +} + +static inline void syscall_set_return_value(struct task_struct *task, + struct pt_regs *regs, + int error, long val) +{ + regs->ax = (long) error ?: val; +} + +#ifdef CONFIG_X86_32 + +static inline void syscall_get_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned int i, unsigned int n, + unsigned long *args) +{ + BUG_ON(i + n > 6); + memcpy(args, ®s->bx + i, n * sizeof(args[0])); +} + +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned int i, unsigned int n, + const unsigned long *args) +{ + BUG_ON(i + n > 6); + memcpy(®s->bx + i, args, n * sizeof(args[0])); +} + +#else /* CONFIG_X86_64 */ + +static inline void syscall_get_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned int i, unsigned int n, + unsigned long *args) +{ +# ifdef CONFIG_IA32_EMULATION + if (task_thread_info(task)->status & TS_COMPAT) - switch (i + n) { - case 6: ++ switch (i) { ++ case 0: + if (!n--) break; - *args++ = regs->bp; - case 5: ++ *args++ = regs->bx; ++ case 1: + if (!n--) break; - *args++ = regs->di; - case 4: ++ *args++ = regs->cx; ++ case 2: + if (!n--) break; - *args++ = regs->si; ++ *args++ = regs->dx; + case 3: + if (!n--) break; - *args++ = regs->dx; - case 2: ++ *args++ = regs->si; ++ case 4: + if (!n--) break; - *args++ = regs->cx; - case 1: ++ *args++ = regs->di; ++ case 5: + if (!n--) break; - *args++ = regs->bx; - case 0: ++ *args++ = regs->bp; ++ case 6: + if (!n--) break; + default: + BUG(); + break; + } + else +# endif - switch (i + n) { - case 6: ++ switch (i) { ++ case 0: + if (!n--) break; - *args++ = regs->r9; - case 5: ++ *args++ = regs->di; ++ case 1: + if (!n--) break; - *args++ = regs->r8; - case 4: ++ *args++ = regs->si; ++ case 2: + if (!n--) break; - *args++ = regs->r10; ++ *args++ = regs->dx; + case 3: + if (!n--) break; - *args++ = regs->dx; - case 2: ++ *args++ = regs->r10; ++ case 4: + if (!n--) break; - *args++ = regs->si; - case 1: ++ *args++ = regs->r8; ++ case 5: + if (!n--) break; - *args++ = regs->di; - case 0: ++ *args++ = regs->r9; ++ case 6: + if (!n--) break; + default: + BUG(); + break; + } +} + +static inline void syscall_set_arguments(struct task_struct *task, + struct pt_regs *regs, + unsigned int i, unsigned int n, + const unsigned long *args) +{ +# ifdef CONFIG_IA32_EMULATION + if (task_thread_info(task)->status & TS_COMPAT) - switch (i + n) { - case 6: ++ switch (i) { ++ case 0: + if (!n--) break; - regs->bp = *args++; - case 5: ++ regs->bx = *args++; ++ case 1: + if (!n--) break; - regs->di = *args++; - case 4: ++ regs->cx = *args++; ++ case 2: + if (!n--) break; - regs->si = *args++; ++ regs->dx = *args++; + case 3: + if (!n--) break; - regs->dx = *args++; - case 2: ++ regs->si = *args++; ++ case 4: + if (!n--) break; - regs->cx = *args++; - case 1: ++ regs->di = *args++; ++ case 5: + if (!n--) break; - regs->bx = *args++; - case 0: ++ regs->bp = *args++; ++ case 6: + if (!n--) break; + default: + BUG(); ++ break; + } + else +# endif - switch (i + n) { - case 6: ++ switch (i) { ++ case 0: + if (!n--) break; - regs->r9 = *args++; - case 5: ++ regs->di = *args++; ++ case 1: + if (!n--) break; - regs->r8 = *args++; - case 4: ++ regs->si = *args++; ++ case 2: + if (!n--) break; - regs->r10 = *args++; ++ regs->dx = *args++; + case 3: + if (!n--) break; - regs->dx = *args++; - case 2: ++ regs->r10 = *args++; ++ case 4: + if (!n--) break; - regs->si = *args++; - case 1: ++ regs->r8 = *args++; ++ case 5: + if (!n--) break; - regs->di = *args++; - case 0: ++ regs->r9 = *args++; ++ case 6: + if (!n--) break; + default: + BUG(); ++ break; + } +} + +#endif /* CONFIG_X86_32 */ + +#endif /* _ASM_X86_SYSCALL_H */