From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1KLLtZ-00019s-EE for user-mode-linux-devel@lists.sourceforge.net; Tue, 22 Jul 2008 10:43:29 -0700 Received: from nf-out-0910.google.com ([64.233.182.190]) by mail.sourceforge.net with esmtp (Exim 4.44) id 1KLLtX-0003zP-O8 for user-mode-linux-devel@lists.sourceforge.net; Tue, 22 Jul 2008 10:43:29 -0700 Received: by nf-out-0910.google.com with SMTP id g16so605348nfd.2 for ; Tue, 22 Jul 2008 10:43:26 -0700 (PDT) Date: Tue, 22 Jul 2008 18:41:52 +0100 From: WANG Cong Message-ID: <20080722174152.GF3081@hack.voiplan.pt> MIME-Version: 1.0 Content-Disposition: inline Subject: [uml-devel] [Patch] uml: fix another build error List-Id: The user-mode Linux development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: user-mode-linux-devel-bounces@lists.sourceforge.net Errors-To: user-mode-linux-devel-bounces@lists.sourceforge.net To: LKML Cc: jdike@addtoit.com, user-mode-linux-devel@lists.sourceforge.net CkZpeGVkIHRoaXMgZXJyb3I6CgogIENDICAgICAgYXJjaC91bS9kcml2ZXJzL3ZkZV91c2VyLm8K ICAvaG9tZS93YW5nY29uZy9Qcm9qZWN0cy9saW51eC0yLjYvYXJjaC91bS9kcml2ZXJzL3ZkZV91 c2VyLmM6IEluCmZ1bmN0aW9uIOKAmHZkZV9pbml0X2xpYnN0dWZm4oCZOgovaG9tZS93YW5nY29u Zy9Qcm9qZWN0cy9saW51eC0yLjYvYXJjaC91bS9kcml2ZXJzL3ZkZV91c2VyLmM6ODE6CmVycm9y OiBpbXBsaWNpdCBkZWNsYXJhdGlvbiBvZiBmdW5jdGlvbiDigJhrbWFsbG9j4oCZCi9ob21lL3dh bmdjb25nL1Byb2plY3RzL2xpbnV4LTIuNi9hcmNoL3VtL2RyaXZlcnMvdmRlX3VzZXIuYzo4MToK d2FybmluZzogYXNzaWdubWVudCBtYWtlcyBwb2ludGVyIGZyb20gaW50ZWdlciB3aXRob3V0IGEg Y2FzdAptYWtlWzJdOiAqKiogW2FyY2gvdW0vZHJpdmVycy92ZGVfdXNlci5vXSBFcnJvciAxCm1h a2VbMV06ICoqKiBbYXJjaC91bS9kcml2ZXJzL3ZkZV91c2VyLmtvXSBFcnJvciAyCm1ha2U6ICoq KiBbc3ViLW1ha2VdIEVycm9yIDIKClNpZ25lZC1vZmYtYnk6IFdBTkcgQ29uZyA8d2FuZ2NvbmdA emV1dXgub3JnPgpDYzogamRpa2VAYWRkdG9pdC5jb20KCi0tLQpkaWZmIC0tZ2l0IGEvYXJjaC91 bS9kcml2ZXJzL3ZkZV91c2VyLmMgYi9hcmNoL3VtL2RyaXZlcnMvdmRlX3VzZXIuYwppbmRleCA1 NjUzM2RiLi43NDRlYWNmIDEwMDY0NAotLS0gYS9hcmNoL3VtL2RyaXZlcnMvdmRlX3VzZXIuYwor KysgYi9hcmNoL3VtL2RyaXZlcnMvdmRlX3VzZXIuYwpAQCAtNzgsNyArNzgsNyBAQCB2b2lkIHZk ZV9pbml0X2xpYnN0dWZmKHN0cnVjdCB2ZGVfZGF0YSAqdnByaSwgc3RydWN0IHZkZV9pbml0ICpp bml0KQogewogCXN0cnVjdCB2ZGVfb3Blbl9hcmdzICphcmdzOwogCi0JdnByaS0+YXJncyA9IGtt YWxsb2Moc2l6ZW9mKHN0cnVjdCB2ZGVfb3Blbl9hcmdzKSwgVU1fR0ZQX0tFUk5FTCk7CisJdnBy aS0+YXJncyA9IHVtbF9rbWFsbG9jKHNpemVvZihzdHJ1Y3QgdmRlX29wZW5fYXJncyksIFVNX0dG UF9LRVJORUwpOwogCWlmICh2cHJpLT5hcmdzID09IE5VTEwpIHsKIAkJcHJpbnRrKFVNX0tFUk5f RVJSICJ2ZGVfaW5pdF9saWJzdHVmZiAtIHZkZV9vcGVuX2FyZ3MgIgogCQkgICAgICAgImFsbG9j YXRpb24gZmFpbGVkIik7CgotLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tClRoaXMgU0YuTmV0IGVtYWlsIGlzIHNw b25zb3JlZCBieSB0aGUgTW9ibGluIFlvdXIgTW92ZSBEZXZlbG9wZXIncyBjaGFsbGVuZ2UKQnVp bGQgdGhlIGNvb2xlc3QgTGludXggYmFzZWQgYXBwbGljYXRpb25zIHdpdGggTW9ibGluIFNESyAm IHdpbiBncmVhdCBwcml6ZXMKR3JhbmQgcHJpemUgaXMgYSB0cmlwIGZvciB0d28gdG8gYW4gT3Bl biBTb3VyY2UgZXZlbnQgYW55d2hlcmUgaW4gdGhlIHdvcmxkCmh0dHA6Ly9tb2JsaW4tY29udGVz dC5vcmcvcmVkaXJlY3QucGhwP2Jhbm5lcl9pZD0xMDAmdXJsPS8KX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KVXNlci1tb2RlLWxpbnV4LWRldmVsIG1haWxp bmcgbGlzdApVc2VyLW1vZGUtbGludXgtZGV2ZWxAbGlzdHMuc291cmNlZm9yZ2UubmV0Cmh0dHBz Oi8vbGlzdHMuc291cmNlZm9yZ2UubmV0L2xpc3RzL2xpc3RpbmZvL3VzZXItbW9kZS1saW51eC1k ZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755159AbYGVRn5 (ORCPT ); Tue, 22 Jul 2008 13:43:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752729AbYGVRne (ORCPT ); Tue, 22 Jul 2008 13:43:34 -0400 Received: from nf-out-0910.google.com ([64.233.182.187]:41639 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752712AbYGVRnc (ORCPT ); Tue, 22 Jul 2008 13:43:32 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:content-transfer-encoding:user-agent; b=HpySCgzy9tKQc3ACSS7byn2Qk7OzGeH1PKkGygbNlildVrKd55jOpn1HUJNL7zCSyG Hm9+rZ0Mc7u4O/UIJoBHkaJVSNhuv1OdJV7Q059hidUN+kLdo4W8MsaZEykGyWkzitHl PkPy13BZQ8xUiecYv5ddlWSBJtYaMxRFh+fDA= Date: Tue, 22 Jul 2008 18:41:52 +0100 From: WANG Cong To: LKML Cc: jdike@addtoit.com, user-mode-linux-devel@lists.sourceforge.net Subject: [Patch] uml: fix another build error Message-ID: <20080722174152.GF3081@hack.voiplan.pt> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fixed this error: CC arch/um/drivers/vde_user.o /home/wangcong/Projects/linux-2.6/arch/um/drivers/vde_user.c: In function ‘vde_init_libstuff’: /home/wangcong/Projects/linux-2.6/arch/um/drivers/vde_user.c:81: error: implicit declaration of function ‘kmalloc’ /home/wangcong/Projects/linux-2.6/arch/um/drivers/vde_user.c:81: warning: assignment makes pointer from integer without a cast make[2]: *** [arch/um/drivers/vde_user.o] Error 1 make[1]: *** [arch/um/drivers/vde_user.ko] Error 2 make: *** [sub-make] Error 2 Signed-off-by: WANG Cong Cc: jdike@addtoit.com --- diff --git a/arch/um/drivers/vde_user.c b/arch/um/drivers/vde_user.c index 56533db..744eacf 100644 --- a/arch/um/drivers/vde_user.c +++ b/arch/um/drivers/vde_user.c @@ -78,7 +78,7 @@ void vde_init_libstuff(struct vde_data *vpri, struct vde_init *init) { struct vde_open_args *args; - vpri->args = kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL); + vpri->args = uml_kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL); if (vpri->args == NULL) { printk(UM_KERN_ERR "vde_init_libstuff - vde_open_args " "allocation failed");