[PATCH] powerpc: Fix DEBUG_HIGHMEM build break from d4515646699

[PATCH] powerpc: Fix DEBUG_HIGHMEM build break from d4515646699

[Becky Bruce]

Code was added to mm/higmem.c that depends on several
kmap types that powerpc does not support.  We add dummy
invalid definitions for KM_NMI, KM_NM_PTE, and KM_IRQ_PTE.

According to list discussion, this fix should not be needed
anymore starting with 2.6.33.  The code is commented to this
effect so hopefully we will remember to remove this.

Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
---
 arch/powerpc/include/asm/kmap_types.h |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
index b6bac6f..9163695 100644
--- a/arch/powerpc/include/asm/kmap_types.h
+++ b/arch/powerpc/include/asm/kmap_types.h
@@ -29,5 +29,16 @@ enum km_type {
 	KM_TYPE_NR
 };
 
+/*
+ * This is a temporary build fix that (so they say on lkml....) should no longer
+ * be required after 2.6.33, because of changes planned to the kmap code.
+ * Let's try to remove this cruft then.
+ */
+#ifdef CONFIG_DEBUG_HIGHMEM
+#define KM_NMI		(-1)
+#define KM_NMI_PTE	(-1)
+#define KM_IRQ_PTE	(-1)
+#endif
+
 #endif	/* __KERNEL__ */
 #endif	/* _ASM_POWERPC_KMAP_TYPES_H */
-- 
1.6.0.6

Re: [PATCH] powerpc: Fix DEBUG_HIGHMEM build break from d4515646699

[Josh Boyer]

On Mon, Nov 23, 2009 at 04:28:53PM -0600, Becky Bruce wrote:
>Code was added to mm/higmem.c that depends on several
>kmap types that powerpc does not support.  We add dummy
>invalid definitions for KM_NMI, KM_NM_PTE, and KM_IRQ_PTE.
>
>According to list discussion, this fix should not be needed
>anymore starting with 2.6.33.  The code is commented to this
>effect so hopefully we will remember to remove this.
>
>Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>

Ben, I see you have this queued up in you 'next' branch, but this seems to be
impacting 2.6.32 and according to the comments won't be needed in 2.6.33.
Right now, 2.6.32 doesn't build for a general Fedora ppc32 kernel because of
this bug.  Should this be sent to Linus for .32?

( http://ppc.koji.fedoraproject.org/koji/getfile?taskID=31439&name=build.log
for the curious among you that want to look at the build log)

josh

Re: [PATCH] powerpc: Fix DEBUG_HIGHMEM build break from d4515646699

[Benjamin Herrenschmidt]

On Mon, 2009-11-30 at 12:57 -0500, Josh Boyer wrote:
> On Mon, Nov 23, 2009 at 04:28:53PM -0600, Becky Bruce wrote:
> >Code was added to mm/higmem.c that depends on several
> >kmap types that powerpc does not support.  We add dummy
> >invalid definitions for KM_NMI, KM_NM_PTE, and KM_IRQ_PTE.
> >
> >According to list discussion, this fix should not be needed
> >anymore starting with 2.6.33.  The code is commented to this
> >effect so hopefully we will remember to remove this.
> >
> >Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
> 
> Ben, I see you have this queued up in you 'next' branch, but this seems to be
> impacting 2.6.32 and according to the comments won't be needed in 2.6.33.
> Right now, 2.6.32 doesn't build for a general Fedora ppc32 kernel because of
> this bug.  Should this be sent to Linus for .32?

Why would fedora have DEBUG_HIGHMEM enabled ? I'll see what I can do.

> ( http://ppc.koji.fedoraproject.org/koji/getfile?taskID=31439&name=build.log
> for the curious among you that want to look at the build log)

Cheers,
Ben.

Re: [PATCH] powerpc: Fix DEBUG_HIGHMEM build break from d4515646699

[Josh Boyer]

On Tue, Dec 01, 2009 at 06:49:43AM +1100, Benjamin Herrenschmidt wrote:
>On Mon, 2009-11-30 at 12:57 -0500, Josh Boyer wrote:
>> On Mon, Nov 23, 2009 at 04:28:53PM -0600, Becky Bruce wrote:
>> >Code was added to mm/higmem.c that depends on several
>> >kmap types that powerpc does not support.  We add dummy
>> >invalid definitions for KM_NMI, KM_NM_PTE, and KM_IRQ_PTE.
>> >
>> >According to list discussion, this fix should not be needed
>> >anymore starting with 2.6.33.  The code is commented to this
>> >effect so hopefully we will remember to remove this.
>> >
>> >Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
>> 
>> Ben, I see you have this queued up in you 'next' branch, but this seems to be
>> impacting 2.6.32 and according to the comments won't be needed in 2.6.33.
>> Right now, 2.6.32 doesn't build for a general Fedora ppc32 kernel because of
>> this bug.  Should this be sent to Linus for .32?
>
>Why would fedora have DEBUG_HIGHMEM enabled ? I'll see what I can do.

Why shouldn't it?  Fedora generally builds rawhide kernels with all kinds of
debug options set.

When you say you'll see what you can do, do you mean you'll see if you can get
the patch into .32, or change the Fedora config?  If you mean change the Fedora
config, I can do that myself.  I was more pointing out that you have a .32
patch not needed for .33 heading for .33... ;)

josh

Re: [PATCH] powerpc: Fix DEBUG_HIGHMEM build break from d4515646699

[Benjamin Herrenschmidt]

> When you say you'll see what you can do, do you mean you'll see if you can get
> the patch into .32, or change the Fedora config?  If you mean change the Fedora
> config, I can do that myself.  I was more pointing out that you have a .32
> patch not needed for .33 heading for .33... ;)

I'll try to get the patch in later today

Cheers,
Ben.