Re: linux-next: Tree for March 10 (m68k/tlbflush.h)

Re: linux-next: Tree for March 10 (m68k/tlbflush.h)

[Geert Uytterhoeven]

Hi Greg,

http://kisskb.ellerman.id.au/kisskb/buildresult/180587/
| arch/m68k/kernel/traps.c:274: error: implicit declaration of
function '__flush_tlb040_one'

http://kisskb.ellerman.id.au/kisskb/buildresult/180591/
| mm/vmalloc.c:555: error: implicit declaration of function
'flush_tlb_kernel_range'

Caused by:

| commit 7fa69761ea82752b97502383f7f2d3fdfa509115
| Author: Greg Ungerer <gerg@uclinux.org>
| Date:   Tue Feb 17 14:40:47 2009 +1000
|
|     m68k: merge the mmu and non-mmu versions of tlbflush.h
|
|     Simple merge of the mmu and non-mmu versions of tlbflush.h
|
|     Signed-off-by: Greg Ungerer <gerg@uclinux.org>

Seems like you merged the wrong way:

| diff --git a/arch/m68k/include/asm/tlbflush.h
b/arch/m68k/include/asm/tlbflush.h
| index b6f93b3..79050d0 100644
| --- a/arch/m68k/include/asm/tlbflush.h
| +++ b/arch/m68k/include/asm/tlbflush.h
| @@ -1,5 +1,267 @@
| -#ifdef __uClinux__
| -#include "tlbflush_no.h"
| +#ifndef _M68K_TLBFLUSH_H
| +#define _M68K_TLBFLUSH_H
| +
| +#ifndef CONFIG_MMU
    ^^^^^
    ifdef

| +#ifndef CONFIG_SUN3

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

Re: linux-next: Tree for March 10 (m68k/tlbflush.h)

[Greg Ungerer]

Hi Geert,

Geert Uytterhoeven wrote:
> Hi Greg,
> 
> http://kisskb.ellerman.id.au/kisskb/buildresult/180587/
> | arch/m68k/kernel/traps.c:274: error: implicit declaration of
> function '__flush_tlb040_one'
> 
> http://kisskb.ellerman.id.au/kisskb/buildresult/180591/
> | mm/vmalloc.c:555: error: implicit declaration of function
> 'flush_tlb_kernel_range'
> 
> Caused by:
> 
> | commit 7fa69761ea82752b97502383f7f2d3fdfa509115
> | Author: Greg Ungerer <gerg@uclinux.org>
> | Date:   Tue Feb 17 14:40:47 2009 +1000
> |
> |     m68k: merge the mmu and non-mmu versions of tlbflush.h
> |
> |     Simple merge of the mmu and non-mmu versions of tlbflush.h
> |
> |     Signed-off-by: Greg Ungerer <gerg@uclinux.org>
> 
> Seems like you merged the wrong way:
> 
> | diff --git a/arch/m68k/include/asm/tlbflush.h
> b/arch/m68k/include/asm/tlbflush.h
> | index b6f93b3..79050d0 100644
> | --- a/arch/m68k/include/asm/tlbflush.h
> | +++ b/arch/m68k/include/asm/tlbflush.h
> | @@ -1,5 +1,267 @@
> | -#ifdef __uClinux__
> | -#include "tlbflush_no.h"
> | +#ifndef _M68K_TLBFLUSH_H
> | +#define _M68K_TLBFLUSH_H
> | +
> | +#ifndef CONFIG_MMU
>     ^^^^^
>     ifdef
> 
> | +#ifndef CONFIG_SUN3

Yep, your absolutely right. Oddly enough it didn't stop non-mmu
builds from compiling or working...

I have fixed that patch, and pushed it into the m68knommu git
tree (for-next branch).

Thanks
Greg


------------------------------------------------------------------------
Greg Ungerer  --  Principal Engineer        EMAIL:     gerg@snapgear.com
SnapGear, a McAfee Company                  PHONE:       +61 7 3435 2888
825 Stanley St,                             FAX:         +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia         WEB: http://www.SnapGear.com