lkml.org 
[lkml]   [2010]   [May]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 05/13] s390: removing redundant ifdefs
Date
wbr,
jirka


Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
arch/s390/include/asm/processor.h | 5 -----
arch/s390/kernel/vdso.c | 4 ----
2 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index 73e2598..ced1714 100644
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -52,8 +52,6 @@ extern int get_cpu_capability(unsigned int *);

#endif /* __s390x__ */

-#ifdef __KERNEL__
-
#ifndef __s390x__
#define STACK_TOP (1UL << 31)
#define STACK_TOP_MAX (1UL << 31)
@@ -62,9 +60,6 @@ extern int get_cpu_capability(unsigned int *);
#define STACK_TOP_MAX (1UL << 42)
#endif /* __s390x__ */

-
-#endif
-
#define HAVE_ARCH_PICK_MMAP_LAYOUT

typedef struct {
diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c
index 6bc9c19..6b83870 100644
--- 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)
{
--
1.6.6.1


\
 
 \ /
  Last update: 2010-05-06 19:43    [W:0.132 / U:1.324 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site