From patchwork Thu Jan 7 18:42:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 7979101 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E60F89F3E6 for ; Thu, 7 Jan 2016 18:45:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 273A520138 for ; Thu, 7 Jan 2016 18:45:22 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4ABEA2012E for ; Thu, 7 Jan 2016 18:45:21 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHFW9-000210-91; Thu, 07 Jan 2016 18:42:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHFW7-00020v-Nd for xen-devel@lists.xen.org; Thu, 07 Jan 2016 18:42:35 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id DC/06-28228-B91BE865; Thu, 07 Jan 2016 18:42:35 +0000 X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1452192151!14436429!1 X-Originating-IP: [209.85.160.174] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47361 invoked from network); 7 Jan 2016 18:42:32 -0000 Received: from mail-yk0-f174.google.com (HELO mail-yk0-f174.google.com) (209.85.160.174) by server-4.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 7 Jan 2016 18:42:32 -0000 Received: by mail-yk0-f174.google.com with SMTP id a85so262020811ykb.1 for ; Thu, 07 Jan 2016 10:42:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=Y5ErGnWVaIP4z5P979eaNcxxa5P2CMedugbUjC7HA2k=; b=pLzi0qNhvH0EkIGN/LWfIFDCyH7ZWeYdkq3Sz1/cTcRubYkl814n2FOprF4KDSCMC6 qXhhy/WmbPNIkQu+UumxWFo4CNmpXttrkAdO7VAok63aR2xiHsA0vIS6Ua8nGhO3xS93 vHSbKBLfQ1ugJLpxoR6mVcemkQ2BmESjpBQJzB+/5WEAl/7A07GvFQ4MOPA5OmnsW/ER wLMr6dTBWTd23YJ7jia9CTJK+CmiTMsKQTPLMameAmPEgvuP0HdckZvH2yO6YAhSXvdW Fd5vdk0nCOZcDdNjAkkqSkUcXXO1Y3DvOWAAfgpNL6snfC+SxKNKpHiET2KraH+G0S70 Siog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Y5ErGnWVaIP4z5P979eaNcxxa5P2CMedugbUjC7HA2k=; b=HXwaN3xGd767BXSXUrrdR4I1hkotFRGUXL6PWucw0sg3kWM1KtpKVj10iOKJtDSa+g FOlrsKKrwYNWNyXWX/XiJT9GViaKEkxolgI0rTQMel/2AnHCHRrrSUlewociroFJxJxp +X6a/M2EIVGvd6yMg5CXaO5X67f3IWWQlbCG7LuIUdPnFQyKYtx2IT9Txl2qLRxBu3F7 6zfhFD+3VVYqs2xD6kwKa8ki8MvDy1pwbyxRa8zdqCtAXu2lO5n4xlf6/Ql3z3vg4LhJ fB1yEMj6MTcnn/YYVjsj9f7+bFHViDHDBv+QDcEPJt468IeAsYcR+nHT7y7YN81ekwRz lI/w== X-Gm-Message-State: ALoCoQkFRPnrh/HiCmFOIA5s/6TfVScDadQNWcyakomGyaSs9AOAJkGowbgDfyi8uRCNs5+xnrJNPsvYuwO12S7l9FlkGCJpbg== X-Received: by 10.129.85.88 with SMTP id j85mr80028604ywb.194.1452192151359; Thu, 07 Jan 2016 10:42:31 -0800 (PST) Received: from swanson.lan (c-68-46-196-185.hsd1.al.comcast.net. [68.46.196.185]) by smtp.gmail.com with ESMTPSA id u190sm85703530ywd.17.2016.01.07.10.42.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jan 2016 10:42:30 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Thu, 7 Jan 2016 12:42:17 -0600 Message-Id: <1452192137-19761-1-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.4.10 Cc: Daniel De Graaf , Doug Goldstein Subject: [Xen-devel] [PATCH] xen: fix missing XSM_ENABLE change X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 This is broken from "xen: convert XSM_ENABLE to Kconfig" 6d5293032f5fc1c65f7a73548afaa3caa8e0105a. This hunk was dropped when I made my v2 for some reason. CC: Daniel De Graaf Signed-off-by: Doug Goldstein Acked-by: Daniel De Graaf --- xen/xsm/xsm_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index 2a74496..5e432de 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -17,7 +17,7 @@ #include #include -#ifdef XSM_ENABLE +#ifdef CONFIG_XSM #define XSM_FRAMEWORK_VERSION "1.0.0"