Re: [PATCH 25/39] merge common parts of uaccess.

From: Ingo Molnar
Date: Mon Jun 30 2008 - 02:32:33 EST



* Ingo Molnar <mingo@xxxxxxx> wrote:

> * Glauber Costa <gcosta@xxxxxxxxxx> wrote:
>
> > common parts of uaccess_32.h and uaccess_64.h
> > are put in uaccess.h.
>
> -tip testing found that it causes this build failure:
>
> fs/binfmt_aout.c: Assembler messages:
> fs/binfmt_aout.c:152: Error: suffix or operands invalid for `cmp'
>
> with:
>
> http://redhat.com/~mingo/misc/config-Mon_Jun_30_08_17_42_CEST_2008.bad

there was another merge fallout as well, when i merged it into
tip/master - see below.

Ingo

------------->
commit d0a1b893fd764ae722cef905bf282c52b768feb1
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Mon Jun 30 08:05:44 2008 +0200

- fix merge fallout between x86/unify-lib and tracing/nmisafe

Signed-off-by: Ingo Molnar <mingo@xxxxxxx>

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 32c5ffd..19c7210 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -765,7 +765,7 @@ retint_signal:
/* Returning to kernel space from exception. */
/* rcx: threadinfo. interrupts off. */
ENTRY(retexc_kernel)
- testl $HARDNMI_MASK,threadinfo_preempt_count(%rcx)
+ testl $HARDNMI_MASK, TI_preempt_count(%rcx)
jz retint_kernel /* Not nested over NMI ? */
testw $X86_EFLAGS_TF,EFLAGS-ARGOFFSET(%rsp) /* trap flag? */
jnz retint_kernel /*
@@ -946,7 +946,7 @@ paranoid_restore_no_nmi\trace:
jmp irq_return
paranoid_restore\trace:
GET_THREAD_INFO(%rcx)
- testl $HARDNMI_MASK,threadinfo_preempt_count(%rcx)
+ testl $HARDNMI_MASK, TI_preempt_count(%rcx)
jz paranoid_restore_no_nmi\trace /* Nested over NMI ? */
testw $X86_EFLAGS_TF,EFLAGS-0(%rsp) /* trap flag? */
jnz paranoid_restore_no_nmi\trace
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/