[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Mon, 6 Jun 2016 13:22:45 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Russell King <rmk+kernel@....linux.org.uk>
Subject: Re: linux-next: build failure after merge of the akpm-current tree
On Mon, 6 Jun 2016 14:03:27 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> In file included from include/linux/crash_dump.h:5:0,
> from arch/powerpc/kernel/crash_dump.c:14:
> include/linux/kexec.h:358:9: note: previous implicit declaration of 'phys_to_virt' was here
> return phys_to_virt(boot_phys_to_phys(entry));
> ^
>
> Caused by commit
>
> 4382eb9055be ("kexec: allow architectures to override boot mapping")
>
> Architecture seem to define phys_to_virt() in either asm/io.h or
> asm/memory.h or asm/virtconvert.h or asm/page*.h ... or asm-generic/io.h.
> :-(
>
> I have reverted that commit for today (and commit c9aaeae038fa ("ARM:
> kexec: fix kexec for Keystone 2")).
Let's see how this gets along.
From: Andrew Morton <akpm@...ux-foundation.org>
Subject: kexec-allow-architectures-to-override-boot-mapping-fix
kexec.h needs asm/io.h for phys_to_virt()
Reported-by: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Russell King <rmk+kernel@....linux.org.uk>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
---
--- a/include/linux/kexec.h~kexec-allow-architectures-to-override-boot-mapping-fix
+++ a/include/linux/kexec.h
@@ -14,6 +14,8 @@
#if !defined(__ASSEMBLY__)
+#include <asm/io.h>
+
#include <uapi/linux/kexec.h>
#ifdef CONFIG_KEXEC_CORE
Powered by blists - more mailing lists