linux-kernel - Re: [PATCH 03/13] arm: 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:	Thu, 6 May 2010 20:36:13 +0100
From:	Russell King - ARM Linux <linux@....linux.org.uk>
To:	Jiri Olsa <jolsa@...hat.com>
Cc:	kernel-janitors@...r.kernel.org, linux-kernel@...r.kernel.org,
	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 03/13] arm: removing redundant ifdefs

Ah, it's finally come through.

On Thu, May 06, 2010 at 07:36:07PM +0200, Jiri Olsa wrote:
> --- a/arch/arm/include/asm/processor.h
> +++ b/arch/arm/include/asm/processor.h
> @@ -22,11 +22,9 @@
>  #include <asm/ptrace.h>
>  #include <asm/types.h>
>  
> -#ifdef __KERNEL__
>  #define STACK_TOP	((current->personality & ADDR_LIMIT_32BIT) ? \
>  			 TASK_SIZE : TASK_SIZE_26)
>  #define STACK_TOP_MAX	TASK_SIZE
> -#endif

This one is correct.

> --- a/arch/arm/mach-ixp23xx/include/mach/platform.h
> +++ b/arch/arm/mach-ixp23xx/include/mach/platform.h
> @@ -43,7 +43,6 @@ extern struct sys_timer ixp23xx_timer;
>  
>  #define IXP23XX_UART_XTAL		14745600
>  
> -#ifndef __ASSEMBLY__
>  /*
>   * Is system memory on the XSI or CPP bus?
>   */
> @@ -51,7 +50,5 @@ static inline unsigned ixp23xx_cpp_boot(void)
>  {
>  	return (*IXP23XX_EXP_CFG0 & IXP23XX_EXP_CFG0_XSI_NOT_PRES);
>  }
> -#endif

Ok too.

> --- a/arch/arm/plat-omap/include/plat/clock.h
> +++ b/arch/arm/plat-omap/include/plat/clock.h
> @@ -133,17 +133,12 @@ struct clk {
>  	__s8			usecount;
>  	u8			fixed_div;
>  	u8			flags;
> -#ifdef CONFIG_ARCH_OMAP2PLUS
>  	void __iomem		*clksel_reg;
>  	u32			clksel_mask;
>  	const struct clksel	*clksel;
>  	struct dpll_data	*dpll_data;
>  	const char		*clkdm_name;
>  	struct clockdomain	*clkdm;
> -#else
> -	__u8			rate_offset;
> -	__u8			src_offset;
> -#endif

This is wrong.  There is a preceding #ifdef CONFIG_ARCH_OMAP2PLUS, but
there's also a preceding #endif terminating that conditional section.
--
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/