public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert@linux-m68k•org>
To: Greg Ungerer <gerg@snapgear•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
	linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: Tree for March 10 (m68k/tlbflush.h)
Date: Tue, 10 Mar 2009 21:07:25 +0100	[thread overview]
Message-ID: <10f740e80903101307v70000e0cm61e261050411a715@mail.gmail.com> (raw)

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

             reply	other threads:[~2009-03-10 20:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-10 20:07 Geert Uytterhoeven [this message]
2009-03-11  6:55 ` linux-next: Tree for March 10 (m68k/tlbflush.h) Greg Ungerer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=10f740e80903101307v70000e0cm61e261050411a715@mail.gmail.com \
    --to=geert@linux-m68k$(echo .)org \
    --cc=gerg@snapgear$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox