From c09ed863c8ec6bdb7687976fdb6346641885654b Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 18 Aug 2011 20:10:19 +0100 Subject: [PATCH] --- yaml --- r: 273040 b: refs/heads/master c: c7ea591c91162a203a5961d69f5c86a6ef9d50c1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/um/asm/processor.h | 3 +++ trunk/arch/x86/um/asm/processor_32.h | 3 --- trunk/arch/x86/um/asm/processor_64.h | 3 --- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 5f56035baa94..4cfa391baac4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3579a389730dd74d9f280152c52aa851dd1da860 +refs/heads/master: c7ea591c91162a203a5961d69f5c86a6ef9d50c1 diff --git a/trunk/arch/x86/um/asm/processor.h b/trunk/arch/x86/um/asm/processor.h index d3ac1cecf0f4..f34c4b2d09f3 100644 --- a/trunk/arch/x86/um/asm/processor.h +++ b/trunk/arch/x86/um/asm/processor.h @@ -10,6 +10,9 @@ # include "processor_64.h" #endif +#define ARCH_IS_STACKGROW(address) \ + (address + 65536 + 32 * sizeof(unsigned long) >= UPT_SP(¤t->thread.regs.regs)) + #include #endif diff --git a/trunk/arch/x86/um/asm/processor_32.h b/trunk/arch/x86/um/asm/processor_32.h index ae0d189aafcf..e5b72faea0f6 100644 --- a/trunk/arch/x86/um/asm/processor_32.h +++ b/trunk/arch/x86/um/asm/processor_32.h @@ -63,9 +63,6 @@ static inline void rep_nop(void) #define current_text_addr() \ ({ void *pc; __asm__("movl $1f,%0\n1:":"=g" (pc)); pc; }) -#define ARCH_IS_STACKGROW(address) \ - (address + 32 >= UPT_SP(¤t->thread.regs.regs)) - #define KSTK_EIP(tsk) KSTK_REG(tsk, EIP) #define KSTK_ESP(tsk) KSTK_REG(tsk, UESP) #define KSTK_EBP(tsk) KSTK_REG(tsk, EBP) diff --git a/trunk/arch/x86/um/asm/processor_64.h b/trunk/arch/x86/um/asm/processor_64.h index 6db812b24f48..0186c61d0a7e 100644 --- a/trunk/arch/x86/um/asm/processor_64.h +++ b/trunk/arch/x86/um/asm/processor_64.h @@ -42,9 +42,6 @@ static inline void arch_copy_thread(struct arch_thread *from, #define current_text_addr() \ ({ void *pc; __asm__("movq $1f,%0\n1:":"=g" (pc)); pc; }) -#define ARCH_IS_STACKGROW(address) \ - (address + 128 >= UPT_SP(¤t->thread.regs.regs)) - #define KSTK_EIP(tsk) KSTK_REG(tsk, RIP) #define KSTK_ESP(tsk) KSTK_REG(tsk, RSP)