From c5fab569df50222a7d73496a4e22177d052999a7 Mon Sep 17 00:00:00 2001
From: Ian Wienand <ianw@gelato.unsw.edu.au>
Date: Tue, 20 Nov 2007 14:12:46 +1100
Subject: [PATCH] --- yaml --- r: 75087 b: refs/heads/master c:
 e384f41409cb9e543fbc84b375e2ba46cbcbec6a h: refs/heads/master i:   75085:
 c1b7d1ffd67fc127314204d9d04d2bf922a874bd   75083:
 9531d410ce76b5a305bfcf8b3ad5cded50f9e757   75079:
 d54c9d59018c70cc4c0090fd97e75c55aad39246   75071:
 bb3ee8ae3dc87c1bfe420058bc3e9145a0ab2899 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/ia64/kernel/process.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a62204265213..173939d66e1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee211b37aa98123b1d9b19d228011e632a4bbe75
+refs/heads/master: e384f41409cb9e543fbc84b375e2ba46cbcbec6a
diff --git a/trunk/arch/ia64/kernel/process.c b/trunk/arch/ia64/kernel/process.c
index a70ad185725c..7377d323131d 100644
--- a/trunk/arch/ia64/kernel/process.c
+++ b/trunk/arch/ia64/kernel/process.c
@@ -739,6 +739,7 @@ flush_thread (void)
 		ia32_drop_ia64_partial_page_list(current);
 		current->thread.task_size = IA32_PAGE_OFFSET;
 		set_fs(USER_DS);
+		memset(current->thread.tls_array, 0, sizeof(current->thread.tls_array));
 	}
 #endif
 }