From patchwork Fri Sep 9 10:55:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1675980 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.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=YQ4vYfYQ; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MPCb64px8z1yj1 for ; Fri, 9 Sep 2022 20:56:01 +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 ) id 1oWbfl-0003XZ-8L; Fri, 09 Sep 2022 10:55:45 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oWbfj-0003WZ-82 for kernel-team@lists.ubuntu.com; Fri, 09 Sep 2022 10:55:43 +0000 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.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-internal-1.canonical.com (Postfix) with ESMTPS id 062B23F467 for ; Fri, 9 Sep 2022 10:55:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1662720943; bh=LqbSCpKB1wgX1C9kn09flV1ByWOtFgyMinJE/PW8aL8=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=YQ4vYfYQIqdYJYa8CgvpldqcuSQdXP3zjMBzskKwfaJm9m2Jjg+zQ9Uzzr3C8jT9T xjh4/jAsiw0IgcqduiMMLmCZN1gI3ZM3dbjoEnw+8+gmBACi4z8bmDLaf2tPFGIcHt iH8LHtdQXHpMzhOl4+78uN1E1o3N1jk9Mp6kB4ccE31dIdnY8yzxKG4qKR7gU8wW8W Q7K6/1cng8CwmCCaRBPVKUogftZjdeUjvV78SuiBhZA40VebgE4eT5UaUloncQSaiF TroFKdBDB2xGVoYy65wbwdJcad2nA9CfhuiRgcbvF7VZeP4zdT+Hox2h+azWZ3f2qx 66gNrqf9LfyLw== Received: by mail-wr1-f71.google.com with SMTP id i22-20020adfaad6000000b0022a34fc07caso266353wrc.5 for ; Fri, 09 Sep 2022 03:55:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=LqbSCpKB1wgX1C9kn09flV1ByWOtFgyMinJE/PW8aL8=; b=qy5cEQADZotV/zexFw7ZJ1wb/ZIEv6wDWFHofdQFqU8AcqCkhCClBaNcllgjfyi771 QxsdZ2aQUsPXmlt2x8r743aAIB/K0e2ChUXpc44bOQNQLloYsEEvlbhWmZa2bCiNJG8w oTbTh2RUNtftddL403VG/JY03OHrVhpytJ2AJSLwpOrDDnobWQ3h+mmF3zUn9/hXe0OP bexjWmiFBgc+FdqvsIeTiRNZjptrgdKx2ga80qzSa/V3hh+bj2gikrA6qJdK1ljvep2w hauCAnzd++qTgwRa9jbcZUknUpVeAlo3bs3oQzjMRdp80WmEWKiIdceH6aOdS4teawMm +MdQ== X-Gm-Message-State: ACgBeo2KGowESyZGWvg+HYzcRm+uzWjwzNIf+04GJrrn3uL5RECt6eVN WrKNetU4pt8mJl14Ez23yNd7U+DNKYm5HLHjwPcguvQAn25lUattMvhCPwaqqDsx9wATDmO4RW3 kXd+Ne7nuOaMeoshBNZq7AAa3MM/rhbvJkKpcDl11dA== X-Received: by 2002:a5d:47a6:0:b0:22a:3764:cdfa with SMTP id 6-20020a5d47a6000000b0022a3764cdfamr3053806wrb.547.1662720942328; Fri, 09 Sep 2022 03:55:42 -0700 (PDT) X-Google-Smtp-Source: AA6agR4od2SqWMuyhoz5RImNOJxxuVAN63fq835PIOHbQDw81xJ4GNoBFQxDl/Uy1jH00HVe2WZaJQ== X-Received: by 2002:a5d:47a6:0:b0:22a:3764:cdfa with SMTP id 6-20020a5d47a6000000b0022a3764cdfamr3053792wrb.547.1662720942025; Fri, 09 Sep 2022 03:55:42 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:2c47:3ff6:493d:7185]) by smtp.gmail.com with ESMTPSA id r67-20020a1c4446000000b003a5fa79007fsm333213wma.7.2022.09.09.03.55.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Sep 2022 03:55:41 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [K/linux][K/linux-unstable][PATCH] UBUNTU: [Config] Enable EXPOLINE_EXTERN on s390x Date: Fri, 9 Sep 2022 11:55:34 +0100 Message-Id: <20220909105534.59319-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1639924 Enable EXPOLINE_EXTERN and package expoline.o into arch-specific headers. Signed-off-by: Dimitri John Ledkov --- debian.master/config/annotations | 2 +- debian.master/config/config.common.ubuntu | 2 +- debian/rules.d/2-binary-arch.mk | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 32dd8339f3..551ccba02d 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -13540,7 +13540,7 @@ CONFIG_PPC_SECVAR_SYSFS mark note> Architecture: s390 CONFIG_KERNEL_NOBP policy<{'s390x': 'n'}> CONFIG_EXPOLINE policy<{'s390x': 'y'}> -CONFIG_EXPOLINE_EXTERN policy<{'s390x': 'n'}> +CONFIG_EXPOLINE_EXTERN policy<{'s390x': 'y'}> CONFIG_SCHED_TOPOLOGY policy<{'s390x': 'y'}> # Menu: Processor type and features >> Architecture: x86 diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index bd57f3648c..d6cdc96a87 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3644,7 +3644,7 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" CONFIG_EXPERT=y CONFIG_EXPOLINE=y CONFIG_EXPOLINE_AUTO=y -# CONFIG_EXPOLINE_EXTERN is not set +CONFIG_EXPOLINE_EXTERN=y # CONFIG_EXPOLINE_FULL is not set # CONFIG_EXPOLINE_OFF is not set CONFIG_EXPORTFS=y diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 88280d329f..eb3acba7d7 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -332,6 +332,10 @@ endif ifeq ($(build_arch),powerpc) mkdir -p $(hdrdir)/arch/powerpc/lib cp $(builddir)/build-$*/arch/powerpc/lib/*.o $(hdrdir)/arch/powerpc/lib +endif +ifeq ($(build_arch),s390) + mkdir -p $(hdrdir)/arch/s390/lib/expoline/ + cp $(builddir)/build-$*/arch/s390/lib/expoline/*.o $(hdrdir)/arch/s390/lib/expoline/ endif # Copy over scripts/module.lds for building external modules cp $(builddir)/build-$*/scripts/module.lds $(hdrdir)/scripts