| Message ID | 20210812120913.9316-8-tim.gardner@canonical.com |
|---|---|
| State | New |
| Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=aZCx99aW; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Gllqz5GyYz9t1s; Thu, 12 Aug 2021 22:10:07 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1mE9X8-00067X-NL; Thu, 12 Aug 2021 12:10:02 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <tim.gardner@canonical.com>) id 1mE9Wd-0005qV-Cn for kernel-team@lists.ubuntu.com; Thu, 12 Aug 2021 12:09:31 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 4594F40650 for <kernel-team@lists.ubuntu.com>; Thu, 12 Aug 2021 12:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628770171; bh=KWneBkKFuR3vC4SI+f6qkM8uAlUGl+di+P2SYKKWGrM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=aZCx99aWi8DzgLQYjOET84VslTrOwRu3p5XISzjxRE/C643o72+BdXE7Qmo4ACouL FqllRfjKaXZhD8bHrnqBMhh9txLhtQ49UUbTtGTXCEqIKAdaQtLNIrYvWeo10zXzdQ 8j67HNL0tyHeuPWRz3w4xA7RCYd3b2TCbmppGwbkH9ZMG+6Ap4C8+/sWlCEGvEQk2N jXPNrnjcTe9BF8fax8HYa9oQFZzQSsV1NSjtoNHHr22Z0pwwoHYVODpXx+gNqUZDSm EPgWrZSJD+A5GklQCQCphrSWRx6PDMbhZeYhBCLLI2HjQ6IcfI0By8oO/xKZ6K6A8U D5MGpoL3zixeQ== Received: by mail-pj1-f71.google.com with SMTP id y3-20020a17090a8b03b02901787416b139so4901191pjn.4 for <kernel-team@lists.ubuntu.com>; Thu, 12 Aug 2021 05:09:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KWneBkKFuR3vC4SI+f6qkM8uAlUGl+di+P2SYKKWGrM=; b=EI2RjIXteC5oDbWeh6wK/UZkYzOfsUBSMDYllJsKyN1NvYCVDGZ8xqFC+ANS3gpfma T6nXMMaCeXXj1HoJM7F0vCWkzIVDgTUJil4AA+2dyj7YXrmS0PtAOcLnEOcG748tvXFG X1KgaEIkDgWZ0cPGS9GouLztqn3FTIkSsAOHbUUZCCh4fz9li4qgb4Wj8zbRxZgPhNAP a//Yk5sLunUEBZ2NsogEaRLijFvKITOsnYUTO21SD9N3JA++BfPhMF/ftXhcZXY4weTh cvs6Av1G7a9wOK/A6MzkGJnW7vKHdwGpEac0fFtqiCnFd65aeiJRA78hvvTBQG4QAmbr fg4w== X-Gm-Message-State: AOAM532Y0u/12xk9UC3+rmAQb1WTu2erdAiNas88brS0lNW4nEadvJrf w78krWWG9Bt06RB0wkdnkow214k8EjWB04fKdTrQhR44OAC46F30XQ5t0U4MT73xzm2eCFv9qcH XezywFwZvXwJGL+rO0S4INj4Rf1tK7aXG4GrwCaoa2Q== X-Received: by 2002:a63:ff5e:: with SMTP id s30mr188554pgk.390.1628770169548; Thu, 12 Aug 2021 05:09:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvYQY6HFt5+MzI4rTVuYU2GHhROIfaWLP0ORKAxnq/TjsQIq0pw36TIII3E/QWxPlDen63kQ== X-Received: by 2002:a63:ff5e:: with SMTP id s30mr188544pgk.390.1628770169396; Thu, 12 Aug 2021 05:09:29 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id i11sm3204940pfo.29.2021.08.12.05.09.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 05:09:28 -0700 (PDT) From: Tim Gardner <tim.gardner@canonical.com> To: kernel-team@lists.ubuntu.com Subject: [PATCH 7/8] UBUNTU: SAUCE: ubuntu/sgx: move use space header Date: Thu, 12 Aug 2021 06:09:12 -0600 Message-Id: <20210812120913.9316-8-tim.gardner@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210812120913.9316-1-tim.gardner@canonical.com> References: <20210812120913.9316-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
| Series |
Sync to SGX 1.33.2
|
expand
|
diff --git a/ubuntu/sgx/driver.h b/ubuntu/sgx/driver.h index c90e132750600..0049af7d68561 100644 --- a/ubuntu/sgx/driver.h +++ b/ubuntu/sgx/driver.h @@ -9,7 +9,7 @@ #include <linux/rwsem.h> #include <linux/sched.h> #include <linux/workqueue.h> -#include "uapi/asm/sgx_oot.h" +#include "sgx_user.h" #include "sgx.h" #define SGX_EINIT_SPIN_COUNT 20 diff --git a/arch/x86/include/uapi/asm/sgx_oot.h b/ubuntu/sgx/sgx_user.h similarity index 100% rename from arch/x86/include/uapi/asm/sgx_oot.h rename to ubuntu/sgx/sgx_user.h
BugLink: https://bugs.launchpad.net/bugs/1936240 https://github.com/intel/SGXDataCenterAttestationPrimitives a980e06b53be94107379d9361566fd23f0f5303a Linux Driver: move use space header Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- ubuntu/sgx/driver.h | 2 +- arch/x86/include/uapi/asm/sgx_oot.h => ubuntu/sgx/sgx_user.h | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename arch/x86/include/uapi/asm/sgx_oot.h => ubuntu/sgx/sgx_user.h (100%)