From: "Julius Volz" <juliusv@google•com>
To: "David Miller" <davem@davemloft•net>
Cc: horms@verge•net.au, csnook@redhat•com, lvs-devel@vger•kernel.org,
netdev@vger•kernel.org
Subject: Re: Should we move IPVS out of net/ipv4 now?
Date: Mon, 22 Sep 2008 11:16:10 +0200 [thread overview]
Message-ID: <f4845fc0809220216p543af0fcu9ee486feba287c12@mail.gmail.com> (raw)
In-Reply-To: <20080919.124553.193698159.davem@davemloft.net>
On Fri, Sep 19, 2008 at 9:45 PM, David Miller <davem@davemloft•net> wrote:
> From: "Julius Volz" <juliusv@google•com>
> Date: Fri, 19 Sep 2008 11:47:13 +0200
>
>> The build with ARCH=um seems to have a problem with the
>> architecture-specific headers:
>>
>> net/core/skb_dma_map.c: In function 'skb_dma_map':
>> net/core/skb_dma_map.c:20: error: implicit declaration of function
>> 'dma_mapping_error'
>>
>> The bad commit that introduces the skb_dma_map.c file (and this error)
>> is a40c24a1336. Previous versions build fine.
>
> I'll commit the following to net-next-2.6, let me know if it doesn't
> take care of the problem:
>
> net: Fix build with ARCH=um
>
> If UM is going to claim that it supports DMA by setting
> HAS_DMA, it should provide a dma_mapping_error() implementation.
>
> Based upon a report by Julius Volz.
>
> Signed-off-by: David S. Miller <davem@davemloft•net>
> ---
> include/asm-um/dma-mapping.h | 7 +++++++
> 1 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/include/asm-um/dma-mapping.h b/include/asm-um/dma-mapping.h
> index f0ee4fb..90fc708 100644
> --- a/include/asm-um/dma-mapping.h
> +++ b/include/asm-um/dma-mapping.h
> @@ -118,4 +118,11 @@ dma_cache_sync(struct device *dev, void *vaddr, size_t size,
> BUG();
> }
>
> +static inline int
> +dma_mapping_error(struct device *dev, dma_addr_t dma_handle)
> +{
> + BUG();
> + return 0;
> +}
> +
> #endif
> --
Thanks, that got rid of the problem!
Julius
--
Julius Volz - Corporate Operations - SysOps
Google Switzerland GmbH - Identification No.: CH-020.4.028.116-1
next prev parent reply other threads:[~2008-09-22 9:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-17 13:00 Should we move IPVS out of net/ipv4 now? Julius Volz
2008-09-17 18:37 ` Chris Snook
2008-09-17 20:14 ` David Miller
2008-09-18 20:04 ` Julius Volz
2008-09-18 23:52 ` Simon Horman
2008-09-19 0:00 ` David Miller
2008-09-19 9:47 ` Julius Volz
2008-09-19 19:45 ` David Miller
2008-09-22 9:16 ` Julius Volz [this message]
2008-09-18 4:24 ` Simon Horman
2008-09-18 20:05 ` Julius Volz
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=f4845fc0809220216p543af0fcu9ee486feba287c12@mail.gmail.com \
--to=juliusv@google$(echo .)com \
--cc=csnook@redhat$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=horms@verge$(echo .)net.au \
--cc=lvs-devel@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
/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