Merge branch 'linus' into stackprotector

[net-next-2.6.git] / kernel / exit.c

diff --git a/kernel/exit.c b/kernel/exit.c
index 85a83c831856c193570e40a3b7d3e03ef8862d1c..c8d0485578be00a4d46b3b6823f161d0018b3778 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -968,12 +968,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;