From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sfi-mx-4.v28.ch3.sourceforge.com ([172.29.28.124] helo=mx.sourceforge.net) by 235xhf1.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1L5lM9-0002R4-Qp for user-mode-linux-devel@lists.sourceforge.net; Thu, 27 Nov 2008 18:12:49 +0000 Received: from nf-out-0910.google.com ([64.233.182.185]) by 1b2kzd1.ch3.sourceforge.com with esmtp (Exim 4.69) id 1L5lM5-0001oH-Su for user-mode-linux-devel@lists.sourceforge.net; Thu, 27 Nov 2008 18:12:49 +0000 Received: by nf-out-0910.google.com with SMTP id g16so552761nfd.2 for ; Thu, 27 Nov 2008 10:12:43 -0800 (PST) Date: Thu, 27 Nov 2008 18:12:28 +0000 From: =?utf-8?Q?Am=C3=A9rico?= Wang Message-ID: <20081127181228.GA4417@hack.voiplan.pt> MIME-Version: 1.0 Content-Disposition: inline Subject: [uml-devel] [Patch] uml: fix the highmem 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 Errors-To: user-mode-linux-devel-bounces@lists.sourceforge.net To: LKML Cc: Andrew Morton , jdike@addtoit.com, Al Viro , user-mode-linux-devel@lists.sourceforge.net ClRoaXMgcGF0Y2ggZml4ZXMgdGhpcyBlcnJvcjoKCmFyY2gvdW0va2VybmVsL21lbS5jOiBJbiBm dW5jdGlvbiDigJhpbml0X2hpZ2htZW3igJk6ICAgICAgICAKYXJjaC91bS9rZXJuZWwvbWVtLmM6 MTc3OiBlcnJvcjog4oCYcGttYXBfcGFnZV90YWJsZeKAmSB1bmRlY2xhcmVkIChmaXJzdAp1c2Ug aW4gdGhpcyBmdW5jdGlvbikgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKYXJjaC91 bS9rZXJuZWwvbWVtLmM6MTc3OiBlcnJvcjogKEVhY2ggdW5kZWNsYXJlZCBpZGVudGlmaWVyIGlz CnJlcG9ydGVkIG9ubHkgb25jZSAgICAgIAphcmNoL3VtL2tlcm5lbC9tZW0uYzoxNzc6IGVycm9y OiBmb3IgZWFjaCBmdW5jdGlvbiBpdCBhcHBlYXJzIGluLikgIAoKQ29tcGlsZSBhbmQgcnVuIHRl c3RlZC4KClNpZ25lZC1vZmYtYnk6IFdBTkcgQ29uZyA8d2FuZ2NvbmdAemV1dXgub3JnPgpDYzog SmVmZiBEaWtlIDxqZGlrZUBhZGR0b2l0LmNvbT4KQ2M6IEFsIFZpcm8gPHZpcm9AemVuaXYubGlu dXgub3JnLnVrPgoKLS0tCmRpZmYgLS1naXQgYS9hcmNoL3VtL2luY2x1ZGUvYXNtL2ZpeG1hcC5o IGIvYXJjaC91bS9pbmNsdWRlL2FzbS9maXhtYXAuaAppbmRleCA2OWMwMjUyLi40ZTY1NmM5IDEw MDY0NAotLS0gYS9hcmNoL3VtL2luY2x1ZGUvYXNtL2ZpeG1hcC5oCisrKyBiL2FyY2gvdW0vaW5j bHVkZS9hc20vZml4bWFwLmgKQEAgLTQwLDYgKzQwLDkgQEAgZW51bSBmaXhlZF9hZGRyZXNzZXMg ewogI2VuZGlmCiAJX19lbmRfb2ZfZml4ZWRfYWRkcmVzc2VzCiB9OworZXh0ZXJuIHB0ZV90ICpw a21hcF9wYWdlX3RhYmxlOworZXh0ZXJuIHB0ZV90ICprbWFwX3B0ZTsKK2V4dGVybiBwZ3Byb3Rf dCBrbWFwX3Byb3Q7CiAKIGV4dGVybiB2b2lkIF9fc2V0X2ZpeG1hcCAoZW51bSBmaXhlZF9hZGRy ZXNzZXMgaWR4LAogCQkJICB1bnNpZ25lZCBsb25nIHBoeXMsIHBncHJvdF90IGZsYWdzKTsKZGlm ZiAtLWdpdCBhL2FyY2gveDg2L21tL2hpZ2htZW1fMzIuYyBiL2FyY2gveDg2L21tL2hpZ2htZW1f MzIuYwppbmRleCBiY2MwNzljLi44ODRmOWUyIDEwMDY0NAotLS0gYS9hcmNoL3g4Ni9tbS9oaWdo bWVtXzMyLmMKKysrIGIvYXJjaC94ODYvbW0vaGlnaG1lbV8zMi5jCkBAIC0xLDMgKzEsNCBAQAor I2luY2x1ZGUgPGFzbS9maXhtYXAuaD4KICNpbmNsdWRlIDxsaW51eC9oaWdobWVtLmg+CiAjaW5j bHVkZSA8bGludXgvbW9kdWxlLmg+CiAKCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KVGhpcyBTRi5OZXQgZW1h aWwgaXMgc3BvbnNvcmVkIGJ5IHRoZSBNb2JsaW4gWW91ciBNb3ZlIERldmVsb3BlcidzIGNoYWxs ZW5nZQpCdWlsZCB0aGUgY29vbGVzdCBMaW51eCBiYXNlZCBhcHBsaWNhdGlvbnMgd2l0aCBNb2Js aW4gU0RLICYgd2luIGdyZWF0IHByaXplcwpHcmFuZCBwcml6ZSBpcyBhIHRyaXAgZm9yIHR3byB0 byBhbiBPcGVuIFNvdXJjZSBldmVudCBhbnl3aGVyZSBpbiB0aGUgd29ybGQKaHR0cDovL21vYmxp bi1jb250ZXN0Lm9yZy9yZWRpcmVjdC5waHA/YmFubmVyX2lkPTEwMCZ1cmw9LwpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpVc2VyLW1vZGUtbGludXgtZGV2 ZWwgbWFpbGluZyBsaXN0ClVzZXItbW9kZS1saW51eC1kZXZlbEBsaXN0cy5zb3VyY2Vmb3JnZS5u ZXQKaHR0cHM6Ly9saXN0cy5zb3VyY2Vmb3JnZS5uZXQvbGlzdHMvbGlzdGluZm8vdXNlci1tb2Rl LWxpbnV4LWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753597AbYK0SM4 (ORCPT ); Thu, 27 Nov 2008 13:12:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751720AbYK0SMs (ORCPT ); Thu, 27 Nov 2008 13:12:48 -0500 Received: from nf-out-0910.google.com ([64.233.182.190]:27274 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751448AbYK0SMr (ORCPT ); Thu, 27 Nov 2008 13:12:47 -0500 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=w/TM6o8gklATINN3AAlQHbdZbDqtrSroAybg7nOo9HtSxeFSI3hl2VSe+vuzopk2f6 phsUTl9sP6of53aNMT+263SZyLVYgkT3Y4GsTrBSkeTd0g/2nVNS1XB0PbCRrf8xs7DR 1l0ZdWEM6GvbjFqCWjHT1NdUE6Pp5bIHiNcxk= Date: Thu, 27 Nov 2008 18:12:28 +0000 From: =?utf-8?Q?Am=C3=A9rico?= Wang To: LKML Cc: Andrew Morton , jdike@addtoit.com, user-mode-linux-devel@lists.sourceforge.net, Al Viro Subject: [Patch] uml: fix the highmem build error Message-ID: <20081127181228.GA4417@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 This patch fixes this error: arch/um/kernel/mem.c: In function ‘init_highmem’: arch/um/kernel/mem.c:177: error: ‘pkmap_page_table’ undeclared (first use in this function) arch/um/kernel/mem.c:177: error: (Each undeclared identifier is reported only once arch/um/kernel/mem.c:177: error: for each function it appears in.) Compile and run tested. Signed-off-by: WANG Cong Cc: Jeff Dike Cc: Al Viro --- diff --git a/arch/um/include/asm/fixmap.h b/arch/um/include/asm/fixmap.h index 69c0252..4e656c9 100644 --- a/arch/um/include/asm/fixmap.h +++ b/arch/um/include/asm/fixmap.h @@ -40,6 +40,9 @@ enum fixed_addresses { #endif __end_of_fixed_addresses }; +extern pte_t *pkmap_page_table; +extern pte_t *kmap_pte; +extern pgprot_t kmap_prot; extern void __set_fixmap (enum fixed_addresses idx, unsigned long phys, pgprot_t flags); diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c index bcc079c..884f9e2 100644 --- a/arch/x86/mm/highmem_32.c +++ b/arch/x86/mm/highmem_32.c @@ -1,3 +1,4 @@ +#include #include #include