git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
s390
/
kernel
/
vdso.c
diff --git
a/arch/s390/kernel/vdso.c
b/arch/s390/kernel/vdso.c
index
6bc9c19
..
6b83870
100644
(file)
--- a/
arch/s390/kernel/vdso.c
+++ b/
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)
{