Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Marcelo Tosatti <mtosatti@redhat.com>, Gleb Natapov <gleb@kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>
Subject: linux-next: build failure after merge of the kvm tree
Date: Fri, 29 May 2015 17:36:48 +1000
Message-ID: <20150529173648.61bf6592@canb.auug.org.au> (raw)


[-- Attachment #1: Type: text/plain, Size: 1333 bytes --]

Hi all,

After merging the kvm tree, today's linux-next build (x86_64
allmodconfig) failed like this:

arch/x86/kvm/cpuid.c: In function 'kvm_update_cpuid':
arch/x86/kvm/cpuid.c:98:2: error: implicit declaration of function 'use_eager_fpu' [-Werror=implicit-function-declaration]
  vcpu->arch.eager_fpu = use_eager_fpu() || guest_cpuid_has_mpx(vcpu);
  ^

Caused by a bad automatic merge resolution which didn't add the
includes of one of its parents.

I added the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 May 2015 17:24:42 +1000
Subject: [PATCH] kvm: bad merge fix patch for arch/x86/kvm/cpuid.c

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/x86/kvm/cpuid.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index e243f2ed54c0..8285bc73a5a2 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -16,6 +16,8 @@
 #include <linux/module.h>
 #include <linux/vmalloc.h>
 #include <linux/uaccess.h>
+#include <asm/fpu/api.h> /* For use_eager_fpu.  Ugh! */
+#include <asm/fpu/internal.h> /* For use_eager_fpu.  Ugh! */
 #include <asm/user.h>
 #include <asm/fpu/xstate.h>
 #include "cpuid.h"
-- 
2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

             reply index

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-29  7:36 Stephen Rothwell [this message]
2015-05-29  7:54 ` Ingo Molnar
2015-05-29 12:08 ` Paolo Bonzini
  -- strict thread matches above, loose matches on Subject: below --
2020-07-17  5:57 Stephen Rothwell
2020-07-29  7:06 ` Stephen Rothwell
2020-05-21  6:28 Stephen Rothwell
2020-06-04  2:54 ` Stephen Rothwell
2019-02-18  3:42 Stephen Rothwell
2019-02-19 15:36 ` Sean Christopherson
2019-02-19 18:17   ` Paolo Bonzini
2018-12-19  4:33 Stephen Rothwell
2017-02-08  3:23 Stephen Rothwell
2016-12-19  1:11 Stephen Rothwell
2015-09-08  1:35 Stephen Rothwell
2015-09-08  2:10 ` Wanpeng Li
2015-09-08  9:24   ` Paolo Bonzini
2014-11-24  6:19 Stephen Rothwell
2014-11-24  9:38 ` Paolo Bonzini
2014-08-06  4:39 Stephen Rothwell
2014-03-11 23:55 Mark Brown
2014-01-10  3:00 Stephen Rothwell
2014-01-17  4:03 ` Stephen Rothwell
2012-08-23  3:21 Stephen Rothwell
2012-03-06  4:53 Stephen Rothwell
2012-03-06 10:34 ` Avi Kivity
2010-08-30  1:35 Stephen Rothwell
2010-08-30 10:03 ` Alexander Graf
2010-08-30 10:56   ` Avi Kivity

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=20150529173648.61bf6592@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=gleb@kernel.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mtosatti@redhat.com \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    /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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git