From patchwork Wed Apr 11 20:27:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 151873 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A3214B7070 for ; Thu, 12 Apr 2012 06:28:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933182Ab2DKU2o (ORCPT ); Wed, 11 Apr 2012 16:28:44 -0400 Received: from am1ehsobe002.messaging.microsoft.com ([213.199.154.205]:34511 "EHLO am1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933049Ab2DKU2n (ORCPT ); Wed, 11 Apr 2012 16:28:43 -0400 Received: from mail12-am1-R.bigfish.com (10.3.201.237) by AM1EHSOBE006.bigfish.com (10.3.204.26) with Microsoft SMTP Server id 14.1.225.23; Wed, 11 Apr 2012 20:28:42 +0000 Received: from mail12-am1 (localhost [127.0.0.1]) by mail12-am1-R.bigfish.com (Postfix) with ESMTP id 2D0034C03CC; Wed, 11 Apr 2012 20:28:42 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839h944hd25h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail12-am1 (localhost.localdomain [127.0.0.1]) by mail12-am1 (MessageSwitch) id 1334176120373637_5941; Wed, 11 Apr 2012 20:28:40 +0000 (UTC) Received: from AM1EHSMHS002.bigfish.com (unknown [10.3.201.250]) by mail12-am1.bigfish.com (Postfix) with ESMTP id 530F08138E; Wed, 11 Apr 2012 20:28:40 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by AM1EHSMHS002.bigfish.com (10.3.207.102) with Microsoft SMTP Server (TLS) id 14.1.225.23; Wed, 11 Apr 2012 20:28:35 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.1.355.3; Wed, 11 Apr 2012 15:27:53 -0500 Received: from schlenkerla.am.freescale.net (schlenkerla.am.freescale.net [10.82.121.12]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id q3BKRqL4010486; Wed, 11 Apr 2012 13:27:53 -0700 Date: Wed, 11 Apr 2012 15:27:52 -0500 From: Scott Wood To: Marcelo Tosatti CC: , , Subject: [PATCH] powerpc/e6500: add CPU_FTR_EMB_HV to CPU table Message-ID: <20120411202752.GA12204@schlenkerla.am.freescale.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: freescale.com Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org e6500 support (commit 10241842fbe900276634fee8d37ec48a7d8a762f, "powerpc: Add initial e6500 cpu support" and the introduction of CPU_FTR_EMB_HV (commit 73196cd364a2d972d73fa08da9d81ca3215bed68, "KVM: PPC: e500mc support") collided during merge, leaving e6500's CPU table entry missing CPU_FTR_EMB_HV. Signed-off-by: Scott Wood Acked-by: Kumar Gala --- Fixup patch for the KVM merge as requested by Marcelo. arch/powerpc/include/asm/cputable.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h index 67c34af..50d82c8 100644 --- a/arch/powerpc/include/asm/cputable.h +++ b/arch/powerpc/include/asm/cputable.h @@ -395,7 +395,7 @@ extern const char *powerpc_base_platform; #define CPU_FTRS_E6500 (CPU_FTR_USE_TB | CPU_FTR_NODSISRALIGN | \ CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \ CPU_FTR_DBELL | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \ - CPU_FTR_DEBUG_LVL_EXC) + CPU_FTR_DEBUG_LVL_EXC | CPU_FTR_EMB_HV) #define CPU_FTRS_GENERIC_32 (CPU_FTR_COMMON | CPU_FTR_NODSISRALIGN) /* 64-bit CPUs */