From 0281c8239d78447db7e558d562da8b7ba5128f5a Mon Sep 17 00:00:00 2001 From: Mitsuo Hayasaka Date: Tue, 29 Nov 2011 15:08:45 +0900 Subject: [PATCH] --- yaml --- r: 283541 b: refs/heads/master c: 467e6b7a7c0eb792ebaf322ddb7363742b4ead40 h: refs/heads/master i: 283539: 9e568a6f39bca4800f955713e7f1b831c03134ac v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/irq_64.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 92fd171b41ef..5c703d9111d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55af77969fbd7a841838220ea2287432e0da8ae5 +refs/heads/master: 467e6b7a7c0eb792ebaf322ddb7363742b4ead40 diff --git a/trunk/arch/x86/kernel/irq_64.c b/trunk/arch/x86/kernel/irq_64.c index 42552b0dce6a..54e2b2b2e250 100644 --- a/trunk/arch/x86/kernel/irq_64.c +++ b/trunk/arch/x86/kernel/irq_64.c @@ -46,10 +46,9 @@ static inline void stack_overflow_check(struct pt_regs *regs) if (user_mode_vm(regs)) return; - if (regs->sp >= curbase && - regs->sp <= curbase + THREAD_SIZE && - regs->sp >= curbase + sizeof(struct thread_info) + - sizeof(struct pt_regs) + 128) + if (regs->sp >= curbase + sizeof(struct thread_info) + + sizeof(struct pt_regs) + 128 && + regs->sp <= curbase + THREAD_SIZE) return; irq_stack_top = (u64)__get_cpu_var(irq_stack_union.irq_stack);