linux-kernel - Re: [PATCH 05/13] s390: removing redundant ifdefs

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 7 May 2010 10:46:31 +0200
From:	Heiko Carstens <heiko.carstens@...ibm.com>
To:	Jiri Olsa <jolsa@...hat.com>
Cc:	kernel-janitors@...r.kernel.org, linux-kernel@...r.kernel.org,
	linux@....linux.org.uk, ysato@...rs.sourceforge.jp,
	tony.luck@...el.com, dhowells@...hat.com, kyle@...artin.ca,
	benh@...nel.crashing.org, schwidefsky@...ibm.com,
	jgarzik@...ox.com, hare@...e.de, felipe.balbi@...ia.com
Subject: Re: [PATCH 05/13] s390: removing redundant ifdefs

On Thu, May 06, 2010 at 07:36:09PM +0200, Jiri Olsa wrote:
> wbr,
> jirka
> 
> 
> Signed-off-by: Jiri Olsa <jolsa@...hat.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
> -

Dunno. This looks a bit pointless. After all any ifdef __KERNEL__ is not
needed for this header file since its not exported.
So removing this ifdef and keep the other one doesn't make too much sense.

> 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

An identical patch for this hunk is alread pending in the git s390 tree.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/