linux-um archives
 help / color / mirror / Atom feed
From: Antoine Martin <antoine@nagafix.co.uk>
To: stable@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net
Cc: linux-kernel@vger.kernel.org, user-mode-linux-user@lists.sourceforge.net
Subject: UML build broken since 3.0.75 (also affects 3.2.x)
Date: Sat, 25 May 2013 17:55:22 +0700	[thread overview]
Message-ID: <51A0989A.6070100@nagafix.co.uk> (raw)

Linus' vm patches broke the UML build in 3.0.75 onwards:

  CC      mm/memory.o
mm/memory.c: In function ‘vm_iomap_memory’:
mm/memory.c:2363:2: error: implicit declaration of function
‘io_remap_pfn_range’ [-Werror=implicit-function-declaration]
cc1: some warnings being treated as errors
make[1]: *** [mm/memory.o] Error 1
make: *** [mm] Error 2


This fix is just a copy of what is found in later kernels.
Compiled and boot tested both 3.0.80 and 3.2.45, x86_64 and i386.

Signed-off-by: Antoine Martin <antoine@nagafix.co.uk>

--- a/arch/um/include/asm/pgtable.h	2013-05-25 09:20:51.420000000 +0000
+++ b/arch/um/include/asm/pgtable.h	2013-04-29 00:36:01.000000000 +0000
@@ -69,6 +69,8 @@
 #define PAGE_KERNEL	__pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY |
_PAGE_ACCESSED)
 #define PAGE_KERNEL_EXEC	__pgprot(__PAGE_KERNEL_EXEC)

+#define io_remap_pfn_range	remap_pfn_range
+
 /*
  * The i386 can't do page protection for execute, and considers that
the same
  * are read.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


             reply	other threads:[~2013-05-25 10:55 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-25 10:55 Antoine Martin [this message]
2013-05-25 12:18 ` UML build broken since 3.0.75 (also affects 3.2.x) Greg KH
2013-05-25 13:44   ` richard -rw- weinberger
2013-05-28  3:31     ` Ben Hutchings

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=51A0989A.6070100@nagafix.co.uk \
    --to=antoine@nagafix.co.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=user-mode-linux-devel@lists.sourceforge.net \
    --cc=user-mode-linux-user@lists.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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