linux-kernel - Re: linux-next: manual merge of the akpm tree with the arm-soc tree

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]

Message-ID: <20120229063217.GA13386@zhy>
Date:	Wed, 29 Feb 2012 14:32:17 +0800
From:	Yong Zhang <yong.zhang0@...il.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Haojian Zhuang <haojian.zhuang@...vell.com>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	linux-arm-kernel@...ts.infradead.org
Subject: Re: linux-next: manual merge of the akpm tree with the arm-soc tree

On Wed, Feb 29, 2012 at 05:21:27PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/rtc/rtc-sa1100.c between commit 3888c09074db ("rtc: sa1100:
> declare irq in resource") from the arm-soc tree and commit "drivers/rtc:
> remove IRQF_DISABLED" from the akpm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Your fix looks good to me.

Thanks,
Yong

> -- 
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
> 
> diff --cc drivers/rtc/rtc-sa1100.c
> index c105774,e70b4e6..0000000
> --- a/drivers/rtc/rtc-sa1100.c
> +++ b/drivers/rtc/rtc-sa1100.c
> @@@ -102,23 -156,20 +102,23 @@@ static irqreturn_t sa1100_rtc_interrupt
>   
>   static int sa1100_rtc_open(struct device *dev)
>   {
>  +	struct sa1100_rtc *info = dev_get_drvdata(dev);
>  +	struct rtc_device *rtc = info->rtc;
>   	int ret;
>  -	struct platform_device *plat_dev = to_platform_device(dev);
>  -	struct rtc_device *rtc = platform_get_drvdata(plat_dev);
>   
>  -	ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, 0,
>  +	ret = clk_prepare_enable(info->clk);
>  +	if (ret)
>  +		goto fail_clk;
> - 	ret = request_irq(info->irq_1hz, sa1100_rtc_interrupt, IRQF_DISABLED,
> ++	ret = request_irq(info->irq_1hz, sa1100_rtc_interrupt, 0,
>   		"rtc 1Hz", dev);
>   	if (ret) {
>  -		dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);
>  +		dev_err(dev, "IRQ %d already in use.\n", info->irq_1hz);
>   		goto fail_ui;
>   	}
> - 	ret = request_irq(info->irq_alarm, sa1100_rtc_interrupt, IRQF_DISABLED,
>  -	ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, 0,
> ++	ret = request_irq(info->irq_alarm, sa1100_rtc_interrupt, 0,
>   		"rtc Alrm", dev);
>   	if (ret) {
>  -		dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);
>  +		dev_err(dev, "IRQ %d already in use.\n", info->irq_alarm);
>   		goto fail_ai;
>   	}
>   	rtc->max_user_freq = RTC_FREQ;



-- 
Only stand for myself
--
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/