[PATCH 04/14] arch/{s390,powerpc}: Removing undead ifdef __KERNEL__

From: Christian Dietrich
Date: Mon Sep 06 2010 - 10:36:29 EST


The __KERNEL__ ifdef isn't necessary at this point, because it is
checked in an outer ifdef level already and has no effect here.

Signed-off-by: Christian Dietrich <qy03fugy@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
---
arch/powerpc/include/asm/processor.h | 2 --
arch/powerpc/include/asm/vdso_datapage.h | 2 --
arch/s390/include/asm/processor.h | 4 ----
3 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index 19c05b0..3defd7a 100644
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -122,7 +122,6 @@ extern struct task_struct *last_task_used_spe;
TASK_UNMAPPED_BASE_USER32 : TASK_UNMAPPED_BASE_USER64 )
#endif

-#ifdef __KERNEL__
#ifdef __powerpc64__

#define STACK_TOP_USER64 TASK_SIZE_USER64
@@ -139,7 +138,6 @@ extern struct task_struct *last_task_used_spe;
#define STACK_TOP_MAX STACK_TOP

#endif /* __powerpc64__ */
-#endif /* __KERNEL__ */

typedef struct {
unsigned long seg;
diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h
index 08679c5..25e3922 100644
--- a/arch/powerpc/include/asm/vdso_datapage.h
+++ b/arch/powerpc/include/asm/vdso_datapage.h
@@ -116,9 +116,7 @@ struct vdso_data {

#endif /* CONFIG_PPC64 */

-#ifdef __KERNEL__
extern struct vdso_data *vdso_data;
-#endif

#endif /* __ASSEMBLY__ */

diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index 73e2598..0e2a436 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)
@@ -63,8 +61,6 @@ extern int get_cpu_capability(unsigned int *);
#endif /* __s390x__ */


-#endif
-
#define HAVE_ARCH_PICK_MMAP_LAYOUT

typedef struct {
--
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/