Re: linux-next: Tree for March 10 (m68k/tlbflush.h)
From: Greg Ungerer
Date: Wed Mar 11 2009 - 02:55:39 EST
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@xxxxxxxxxxx>
| 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@xxxxxxxxxxx>
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@xxxxxxxxxxxx
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/