{"id":665,"url":"http://patchwork.ozlabs.org/api/1.0/patches/665/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20080919.124553.193698159.davem@davemloft.net>","date":"2008-09-19T19:45:53","name":"Should we move IPVS out of net/ipv4 now?","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"5a70e70f5ae07efe3c7357e454cb39f2e7305b30","submitter":{"id":15,"url":"http://patchwork.ozlabs.org/api/1.0/people/15/?format=json","name":"David Miller","email":"davem@davemloft.net"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20080919.124553.193698159.davem@davemloft.net/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/665/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Received":["from vger.kernel.org (vger.kernel.org [209.132.176.167])\n\tby ozlabs.org (Postfix) with ESMTP id 449D6DDFC8\n\tfor ;\n\tSat, 20 Sep 2008 05:46:12 +1000 (EST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753916AbYISTqH (ORCPT );\n\tFri, 19 Sep 2008 15:46:07 -0400","(majordomo@vger.kernel.org) by vger.kernel.org id S1753775AbYISTqG\n\t(ORCPT ); Fri, 19 Sep 2008 15:46:06 -0400","from 74-93-104-97-Washington.hfc.comcastbusiness.net\n\t([74.93.104.97]:49744\n\t\"EHLO sunset.davemloft.net\" rhost-flags-OK-FAIL-OK-OK)\n\tby vger.kernel.org with ESMTP id S1753699AbYISTqF (ORCPT\n\t); Fri, 19 Sep 2008 15:46:05 -0400","from localhost (localhost [127.0.0.1])\n\tby sunset.davemloft.net (Postfix) with ESMTP id 25912C8C181;\n\tFri, 19 Sep 2008 12:45:53 -0700 (PDT)"],"Date":"Fri, 19 Sep 2008 12:45:53 -0700 (PDT)","Message-Id":"<20080919.124553.193698159.davem@davemloft.net>","To":"juliusv@google.com","Cc":"horms@verge.net.au, csnook@redhat.com, lvs-devel@vger.kernel.org,\n\tnetdev@vger.kernel.org","Subject":"Re: Should we move IPVS out of net/ipv4 now?","From":"David Miller ","In-Reply-To":"","References":"<20080918235220.GD13536@verge.net.au>\n\t<20080918.170030.32445027.davem@davemloft.net>\n\t","X-Mailer":"Mew version 6.1 on Emacs 22.1 / Mule 5.0 (SAKAKI)","Mime-Version":"1.0","Content-Type":"Text/Plain; charset=us-ascii","Content-Transfer-Encoding":"7bit","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: \"Julius Volz\" \nDate: Fri, 19 Sep 2008 11:47:13 +0200\n\n> The build with ARCH=um seems to have a problem with the\n> architecture-specific headers:\n> \n> net/core/skb_dma_map.c: In function 'skb_dma_map':\n> net/core/skb_dma_map.c:20: error: implicit declaration of function\n> 'dma_mapping_error'\n> \n> The bad commit that introduces the skb_dma_map.c file (and this error)\n> is a40c24a1336. Previous versions build fine.\n\nI'll commit the following to net-next-2.6, let me know if it doesn't\ntake care of the problem:\n\nnet: Fix build with ARCH=um\n\nIf UM is going to claim that it supports DMA by setting\nHAS_DMA, it should provide a dma_mapping_error() implementation.\n\nBased upon a report by Julius Volz.\n\nSigned-off-by: David S. Miller ","diff":"diff --git a/include/asm-um/dma-mapping.h b/include/asm-um/dma-mapping.h\nindex f0ee4fb..90fc708 100644\n--- a/include/asm-um/dma-mapping.h\n+++ b/include/asm-um/dma-mapping.h\n@@ -118,4 +118,11 @@ dma_cache_sync(struct device *dev, void *vaddr, size_t size,\n \tBUG();\n }\n \n+static inline int\n+dma_mapping_error(struct device *dev, dma_addr_t dma_handle)\n+{\n+\tBUG();\n+\treturn 0;\n+}\n+\n #endif\n","prefixes":[]}