From patchwork Tue Jun 24 06:36:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ellerman X-Patchwork-Id: 4406531 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E508BBEEAA for ; Tue, 24 Jun 2014 06:37:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B61120218 for ; Tue, 24 Jun 2014 06:37:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BCD2B202E5 for ; Tue, 24 Jun 2014 06:37:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751360AbaFXGhJ (ORCPT ); Tue, 24 Jun 2014 02:37:09 -0400 Received: from ozlabs.org ([103.22.144.67]:48995 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751121AbaFXGhI (ORCPT ); Tue, 24 Jun 2014 02:37:08 -0400 Received: by ozlabs.org (Postfix, from userid 1034) id F3CDB1400BE; Tue, 24 Jun 2014 16:37:05 +1000 (EST) From: Michael Ellerman To: Andrew Morton Cc: , , , iamjoonsoo.kim@lge.com, agraf@suse.de, Stephen Rothwell Subject: [PATCH] powerpc/kvm: Fix build break with CONFIG_KVM_BOOK3S_64_HV=y Date: Tue, 24 Jun 2014 16:36:47 +1000 Message-Id: <1403591807-9550-1-git-send-email-mpe@ellerman.id.au> X-Mailer: git-send-email 1.9.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit e58e263 "PPC, KVM, CMA: use general CMA reserved area management framework" in next-20140624 removed arch/powerpc/kvm/book3s_hv_cma.c but neglected to update the Makefile, thus breaking the build. Signed-off-by: Michael Ellerman --- Hi Andrew, This is in your akpm-current and is breaking some of the builds for powerpc in linux-next. Squashing this fix into the original patch would be best for us. cheers arch/powerpc/kvm/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile index ce569b6..72905c3 100644 --- a/arch/powerpc/kvm/Makefile +++ b/arch/powerpc/kvm/Makefile @@ -90,7 +90,6 @@ kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) += \ book3s_hv_rm_mmu.o \ book3s_hv_ras.o \ book3s_hv_builtin.o \ - book3s_hv_cma.o \ $(kvm-book3s_64-builtin-xics-objs-y) endif