diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-23 10:20:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-23 10:20:15 +0100 |
| commit | bfe2a3c3b5bf479788d5d5c5561346be6b169043 (patch) | |
| tree | 652c987279db7cd841d556f7bb1a589b57fbd6cc /kernel/exit.c | |
| parent | Merge commit 'v2.6.29-rc2' into perfcounters/core (diff) | |
| parent | Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/... (diff) | |
| download | linux-bfe2a3c3b5bf479788d5d5c5561346be6b169043.tar.xz linux-bfe2a3c3b5bf479788d5d5c5561346be6b169043.zip | |
Merge branch 'core/percpu' into perfcounters/core
Conflicts:
arch/x86/include/asm/hardirq_32.h
arch/x86/include/asm/hardirq_64.h
Semantic merge:
arch/x86/include/asm/hardirq.h
[ added apic_perf_irqs field. ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/exit.c')
| -rw-r--r-- | kernel/exit.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index 29f4b790751c..a1b18c03b4c0 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -980,12 +980,9 @@ static void check_stack_usage(void) { static DEFINE_SPINLOCK(low_water_lock); static int lowest_to_date = THREAD_SIZE; - unsigned long *n = end_of_stack(current); unsigned long free; - while (*n == 0) - n++; - free = (unsigned long)n - (unsigned long)end_of_stack(current); + free = stack_not_used(current); if (free >= lowest_to_date) return; |