Prev: [PATCH] Build break in v2.6.33-rt6
Next: tcpdump broke in 2.6.34-rc1
From: Wu Zhangjin on 12 Mar 2010 07:30
On Fri, 2010-03-12 at 13:10 +0100, John Kacur wrote:
> I get the following build break due to 876c52cc046e00eaa2ffc5124dc187106ef57594
>
> drivers/ide/ide-iops.c:29:26: error: asm/bootinfo.h: No such file or directory
>

I think we'd better revert that commit
876c52cc046e00eaa2ffc5124dc187106ef57594 for it has introduced some arch
specific parts into the common ide source code.

And that commit doesn't influence the preempt-rt support, so, Thomas,
could you please revert it directly, thanks!

Regards,
Wu Zhangjin

> Protect the include by #ifdef CONFIG_MIPS
>
> Signed-off-by: John Kacur <jkacur(a)redhat.com>
> ---
> drivers/ide/ide-iops.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
> index 9dba71e..8d32dda 100644
> --- a/drivers/ide/ide-iops.c
> +++ b/drivers/ide/ide-iops.c
> @@ -26,7 +26,10 @@
> #include <asm/irq.h>
> #include <asm/uaccess.h>
> #include <asm/io.h>
> +
> +#ifdef CONFIG_MIPS
> #include <asm/bootinfo.h>
> +#endif
>
> void SELECT_MASK(ide_drive_t *drive, int mask)
> {


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Thomas Gleixner on 12 Mar 2010 07:50
On Fri, 12 Mar 2010, Wu Zhangjin wrote:

> On Fri, 2010-03-12 at 13:10 +0100, John Kacur wrote:
> > I get the following build break due to 876c52cc046e00eaa2ffc5124dc187106ef57594
> >
> > drivers/ide/ide-iops.c:29:26: error: asm/bootinfo.h: No such file or directory
> >
>
> I think we'd better revert that commit
> 876c52cc046e00eaa2ffc5124dc187106ef57594 for it has introduced some arch
> specific parts into the common ide source code.
>
> And that commit doesn't influence the preempt-rt support, so, Thomas,
> could you please revert it directly, thanks!

Right, that just popped up in testing. I pushed -rt7 with the revert

Thanks,

tglx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH] Build break in v2.6.33-rt6
Next: tcpdump broke in 2.6.34-rc1