Merge branch 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / arch / x86 / kernel / ds.c

diff --git a/arch/x86/kernel/ds.c b/arch/x86/kernel/ds.c
index 24a323c95997c60148177aebbeb5b86cd53b7183..2b69994fd3a800458f4d81abbebad357405eac69 100644 (file)
--- a/arch/x86/kernel/ds.c
+++ b/arch/x86/kernel/ds.c
@@ -29,6 +29,7 @@
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
+#include <linux/mm.h>
 
 
 /*
@@ -478,12 +479,12 @@ static int ds_release(struct task_struct *task, enum ds_qualifier qual)
                goto out;
 
        kfree(context->buffer[qual]);
-       context->buffer[qual] = 0;
+       context->buffer[qual] = NULL;
 
        current->mm->total_vm  -= context->pages[qual];
        current->mm->locked_vm -= context->pages[qual];
        context->pages[qual] = 0;
-       context->owner[qual] = 0;
+       context->owner[qual] = NULL;
 
        /*
         * we put the context twice: