diff --git a/[refs] b/[refs]
index c0eee7469725..6a1da6920531 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58ea91c05346f7c6336e6248b743aa9a8e1c19a9
+refs/heads/master: a78f1c4c1dc4b9dedd17c46dd414f26c7bf1e503
diff --git a/trunk/arch/s390/kernel/vdso.c b/trunk/arch/s390/kernel/vdso.c
index 6bc9c197aa91..6b83870507d5 100644
--- a/trunk/arch/s390/kernel/vdso.c
+++ b/trunk/arch/s390/kernel/vdso.c
@@ -102,11 +102,7 @@ static void vdso_init_per_cpu_data(int cpu, struct vdso_per_cpu_data *vpcd)
 /*
  * Allocate/free per cpu vdso data.
  */
-#ifdef CONFIG_64BIT
 #define SEGMENT_ORDER	2
-#else
-#define SEGMENT_ORDER	1
-#endif
 
 int vdso_alloc_per_cpu(int cpu, struct _lowcore *lowcore)
 {