* [PATCH] Build break in v2.6.33-rt6
@ 2010-03-12 12:10 John Kacur
2010-03-12 12:10 ` [PATCH] ide: Build break in ide-iops.c John Kacur
0 siblings, 1 reply; 4+ messages in thread
From: John Kacur @ 2010-03-12 12:10 UTC (permalink / raw)
To: Thomas Gleixner, rt-users
Cc: lkml, David S. Miller, Bartlomiej Zolnierkiewicz, Sergei Shtylyov,
Wu Zhangjin, John Kacur
The following fixes a build break in v2.6.33-rt6 due to the merging of
git://dev.lemote.com/rt4ls into rt 1054085e15d189e05d4d6ea7e30580c4e0b36d7f
John Kacur (1):
ide: Build break in ide-iops.c
drivers/ide/ide-iops.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ide: Build break in ide-iops.c
2010-03-12 12:10 [PATCH] Build break in v2.6.33-rt6 John Kacur
@ 2010-03-12 12:10 ` John Kacur
2010-03-12 12:17 ` Wu Zhangjin
0 siblings, 1 reply; 4+ messages in thread
From: John Kacur @ 2010-03-12 12:10 UTC (permalink / raw)
To: Thomas Gleixner, rt-users
Cc: lkml, David S. Miller, Bartlomiej Zolnierkiewicz, Sergei Shtylyov,
Wu Zhangjin, John Kacur
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
Protect the include by #ifdef CONFIG_MIPS
Signed-off-by: John Kacur <jkacur@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)
{
--
1.6.6.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ide: Build break in ide-iops.c
2010-03-12 12:10 ` [PATCH] ide: Build break in ide-iops.c John Kacur
@ 2010-03-12 12:17 ` Wu Zhangjin
2010-03-12 12:40 ` Thomas Gleixner
0 siblings, 1 reply; 4+ messages in thread
From: Wu Zhangjin @ 2010-03-12 12:17 UTC (permalink / raw)
To: John Kacur
Cc: Thomas Gleixner, rt-users, lkml, David S. Miller,
Bartlomiej Zolnierkiewicz, Sergei Shtylyov
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@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)
> {
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ide: Build break in ide-iops.c
2010-03-12 12:17 ` Wu Zhangjin
@ 2010-03-12 12:40 ` Thomas Gleixner
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Gleixner @ 2010-03-12 12:40 UTC (permalink / raw)
To: Wu Zhangjin
Cc: John Kacur, rt-users, lkml, David S. Miller,
Bartlomiej Zolnierkiewicz, Sergei Shtylyov
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-03-12 12:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-12 12:10 [PATCH] Build break in v2.6.33-rt6 John Kacur
2010-03-12 12:10 ` [PATCH] ide: Build break in ide-iops.c John Kacur
2010-03-12 12:17 ` Wu Zhangjin
2010-03-12 12:40 ` Thomas Gleixner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).