drm/ttm: Fix an invalid freeing on already freed page in error path

[linux-2.6-microblaze.git] / kernel / kthread.c

diff --git a/kernel/kthread.c b/kernel/kthread.c
index 4fff7df..c5e4083 100644 (file)
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -159,11 +159,10 @@ bool kthread_should_stop(void)
 }
 EXPORT_SYMBOL(kthread_should_stop);
 
-bool __kthread_should_park(struct task_struct *k)
+static bool __kthread_should_park(struct task_struct *k)
 {
        return test_bit(KTHREAD_SHOULD_PARK, &to_kthread(k)->flags);
 }
-EXPORT_SYMBOL_GPL(__kthread_should_park);
 
 /**
  * kthread_should_park - should this kthread park now?
@@ -716,6 +715,24 @@ int kthread_stop(struct task_struct *k)
 }
 EXPORT_SYMBOL(kthread_stop);
 
+/**
+ * kthread_stop_put - stop a thread and put its task struct
+ * @k: thread created by kthread_create().
+ *
+ * Stops a thread created by kthread_create() and put its task_struct.
+ * Only use when holding an extra task struct reference obtained by
+ * calling get_task_struct().
+ */
+int kthread_stop_put(struct task_struct *k)
+{
+       int ret;
+
+       ret = kthread_stop(k);
+       put_task_struct(k);
+       return ret;
+}
+EXPORT_SYMBOL(kthread_stop_put);
+
 int kthreadd(void *unused)
 {
        struct task_struct *tsk = current;
@@ -1470,7 +1487,6 @@ void kthread_unuse_mm(struct mm_struct *mm)
         * clearing tsk->mm.
         */
        smp_mb__after_spinlock();
-       sync_mm_rss(mm);
        local_irq_disable();
        tsk->mm = NULL;
        membarrier_update_current_mm(NULL);