Merge 'ib-jz47xx-battery-prereq' into psy-next

[linux-2.6-microblaze.git] / arch / s390 / kernel / guarded_storage.c

diff --git a/arch/s390/kernel/guarded_storage.c b/arch/s390/kernel/guarded_storage.c
index bff39b6..d14dd1c 100644 (file)
--- a/arch/s390/kernel/guarded_storage.c
+++ b/arch/s390/kernel/guarded_storage.c
@@ -12,11 +12,10 @@
 #include <asm/guarded_storage.h>
 #include "entry.h"
 
-void exit_thread_gs(void)
+void guarded_storage_release(struct task_struct *tsk)
 {
-       kfree(current->thread.gs_cb);
-       kfree(current->thread.gs_bc_cb);
-       current->thread.gs_cb = current->thread.gs_bc_cb = NULL;
+       kfree(tsk->thread.gs_cb);
+       kfree(tsk->thread.gs_bc_cb);
 }
 
 static int gs_enable(void)