linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] m68k/nommu: fix build when CPU is not coldfire
@ 2013-02-17  1:33 Thadeu Lima de Souza Cascardo
  2013-02-21 13:45 ` Greg Ungerer
  0 siblings, 1 reply; 2+ messages in thread
From: Thadeu Lima de Souza Cascardo @ 2013-02-17  1:33 UTC (permalink / raw)
  To: geert; +Cc: gerg, linux-m68k, linux-kernel, Thadeu Lima de Souza Cascardo

Commit dd1cb3a7c43508c29e17836628090c0735bd3137 unified mm/init.c for both MMU
and non-MMU m68k platforms. However, it broke when we build a non-MMU M68K
Classic CPU kernel.

This fix builds a section that came from the MMU version only when we are
building a MMU kernel.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
---
 arch/m68k/mm/init.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index afd8106f..519aad8 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -188,7 +188,7 @@ void __init mem_init(void)
 		}
 	}
 
-#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
+#if defined(CONFIG_MMU) && !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
 	/* insert pointer tables allocated so far into the tablelist */
 	init_pointer_table((unsigned long)kernel_pg_dir);
 	for (i = 0; i < PTRS_PER_PGD; i++) {
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] m68k/nommu: fix build when CPU is not coldfire
  2013-02-17  1:33 [PATCH] m68k/nommu: fix build when CPU is not coldfire Thadeu Lima de Souza Cascardo
@ 2013-02-21 13:45 ` Greg Ungerer
  0 siblings, 0 replies; 2+ messages in thread
From: Greg Ungerer @ 2013-02-21 13:45 UTC (permalink / raw)
  To: Thadeu Lima de Souza Cascardo; +Cc: geert, linux-m68k, linux-kernel

Hi Thadeu,

On 17/02/13 11:33, Thadeu Lima de Souza Cascardo wrote:
> Commit dd1cb3a7c43508c29e17836628090c0735bd3137 unified mm/init.c for both MMU
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Its good practice to include the text title of the patch along with the
commit id.


> and non-MMU m68k platforms. However, it broke when we build a non-MMU M68K
> Classic CPU kernel.
>
> This fix builds a section that came from the MMU version only when we are
> building a MMU kernel.

Looks good thanks. I will push this into the m68knommu git tree.

Regards
Greg



> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
> ---
>   arch/m68k/mm/init.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
> index afd8106f..519aad8 100644
> --- a/arch/m68k/mm/init.c
> +++ b/arch/m68k/mm/init.c
> @@ -188,7 +188,7 @@ void __init mem_init(void)
>   		}
>   	}
>
> -#if !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
> +#if defined(CONFIG_MMU) && !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
>   	/* insert pointer tables allocated so far into the tablelist */
>   	init_pointer_table((unsigned long)kernel_pg_dir);
>   	for (i = 0; i < PTRS_PER_PGD; i++) {
>


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-02-21 13:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-17  1:33 [PATCH] m68k/nommu: fix build when CPU is not coldfire Thadeu Lima de Souza Cascardo
2013-02-21 13:45 ` Greg Ungerer

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).