From patchwork Mon Oct 5 14:05:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 526340 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 999E5140D2D; Tue, 6 Oct 2015 01:06:34 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Zj6PP-0001ri-Gs; Mon, 05 Oct 2015 14:06:31 +0000 Received: from mail-pa0-f50.google.com ([209.85.220.50]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Zj6Op-0001VU-5d for kernel-team@lists.ubuntu.com; Mon, 05 Oct 2015 14:05:55 +0000 Received: by pacfv12 with SMTP id fv12so181806831pac.2 for ; Mon, 05 Oct 2015 07:05:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=TAdIB1XeX5HxbBhLIRO0lR0/nrN6+UzSCRhI4zwlBZU=; b=LJRZj6LkRVr/yfF0ZIhXFRg00uSdVjhJ9ONtreAfPRkJhd8a/PryuwGbIGunPOL+3K iTQ8Sbq1MVdAdrvfO3QSdDQqduiTN+VH5EarFJmNsJTsDT2APVHknM0qg2q7GZNruze4 X/3a5wtjmUnU98i7UM5Sve7APbh0s+RBV0GzNNtZTEgrB3EqklEy9Y33Ay1iLJxCD4NU o5Jo0+Nfmso3tkFkAY/Dx6m8m0pCVwDsabxFAA922zNDo4Zp3Z624YxeqPOVzzaGZPIS NB5V+qDV1e5Gdz7gGsInw2KEIwOjM0ezxVbCGUaJLoGLa3WJADhHRjlM80YbuOhcP3l0 pVCw== X-Gm-Message-State: ALoCoQkAj1+Ln+NTP3U6X0x/6oYPbQezzyGgCR7CFuNqg5HZq6bS8LDG7Dp/LwuvyW8iELn+m5tn X-Received: by 10.66.162.227 with SMTP id yd3mr40608420pab.53.1444053954476; Mon, 05 Oct 2015 07:05:54 -0700 (PDT) Received: from localhost.localdomain (host-174-45-38-91.hln-mt.client.bresnan.net. [174.45.38.91]) by smtp.gmail.com with ESMTPSA id rp5sm28100596pab.0.2015.10.05.07.05.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Oct 2015 07:05:53 -0700 (PDT) From: tim.gardner@canonical.com To: kernel-team@lists.ubuntu.com Subject: [PATCH 07/22] UBUNTU: [Config] CONFIG_X86_LEGACY_VM86=y, CONFIG_VM86=y for i386 Date: Mon, 5 Oct 2015 08:05:11 -0600 Message-Id: <1444053926-18032-8-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1444053926-18032-1-git-send-email-tim.gardner@canonical.com> References: <1444053926-18032-1-git-send-email-tim.gardner@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Tim Gardner BugLink: http://bugs.launchpad.net/bugs/1499089 Signed-off-by: Tim Gardner --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/config.common.ubuntu | 2 +- debian.master/config/i386/config.common.i386 | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 9c87910..66144f1 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -142,6 +142,7 @@ CONFIG_USB_HCD_SSB=m CONFIG_USB_MUSB_HDRC=m CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_VFIO_IOMMU_TYPE1=m +# CONFIG_VM86 is not set CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_SPEEDSTEP_LIB=m CONFIG_XEN=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index d3cf11d..21246e4 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -8612,7 +8612,6 @@ CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y CONFIG_VLSI_FIR=m -# CONFIG_VM86 is not set CONFIG_VME_BUS=y CONFIG_VME_CA91CX42=m CONFIG_VME_PIO2=m @@ -8782,6 +8781,7 @@ CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_IO_APIC=y CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_LEGACY_VM86=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_LONGHAUL=m CONFIG_X86_LONGRUN=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index b11f2ec..8fef2dd 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -142,6 +142,7 @@ CONFIG_USB_HCD_SSB=m CONFIG_USB_MUSB_HDRC=m CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_VFIO_IOMMU_TYPE1=m +CONFIG_VM86=y CONFIG_X86_MINIMUM_CPU_FAMILY=5 CONFIG_X86_SPEEDSTEP_LIB=y CONFIG_XEN=y