@@ -13540,7 +13540,7 @@ CONFIG_PPC_SECVAR_SYSFS mark<ENFORCED> note<LP: #1866909
# Menu: Processor type and features >> 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
@@ -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
@@ -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
BugLink: https://bugs.launchpad.net/bugs/1639924 Enable EXPOLINE_EXTERN and package expoline.o into arch-specific headers. Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com> --- 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(-)