diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2021-03-07 14:40:14 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2021-03-09 17:06:47 +0100 |
| commit | 729e1f7d9cf1009c8dbd1aa3ce8e35335bdaca9a (patch) | |
| tree | f9ad19eec78899b1724e71707bd9625a557beadf | |
| parent | 3f01626e2273ad8b732eb079d8bc0a551f8daa1f (diff) | |
dashboard/config/linux: move IA32/X32 configs to x86_64
It feels that they belong better to x86_64 rather than subsystems.
These are x86-specific and we need compat in baseline config as well
and it's enabled there today anyway.
| -rw-r--r-- | dashboard/config/linux/android-5.4.config | 2 | ||||
| -rw-r--r-- | dashboard/config/linux/bits/subsystems.yml | 4 | ||||
| -rw-r--r-- | dashboard/config/linux/bits/x86_64.yml | 4 | ||||
| -rw-r--r-- | dashboard/config/linux/chromeos-5.4.config | 2 | ||||
| -rw-r--r-- | dashboard/config/linux/upstream-usb.config | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/dashboard/config/linux/android-5.4.config b/dashboard/config/linux/android-5.4.config index d7e84490b..ba0bfcbf3 100644 --- a/dashboard/config/linux/android-5.4.config +++ b/dashboard/config/linux/android-5.4.config @@ -587,7 +587,7 @@ CONFIG_AMD_NB=y # Binary Emulations # CONFIG_IA32_EMULATION=y -# CONFIG_X86_X32 is not set +CONFIG_X86_X32=y CONFIG_COMPAT_32=y CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml index 75f1d90f1..29bdb93e4 100644 --- a/dashboard/config/linux/bits/subsystems.yml +++ b/dashboard/config/linux/bits/subsystems.yml @@ -6,10 +6,6 @@ # some are enabled for unknown now reasons. config: - # 32-on-64 support (compat). - - IA32_EMULATION: [x86_64] - - X86_X32: [x86_64] - - SYSVIPC - POSIX_MQUEUE - NO_HZ diff --git a/dashboard/config/linux/bits/x86_64.yml b/dashboard/config/linux/bits/x86_64.yml index 679a9aecb..5af7651db 100644 --- a/dashboard/config/linux/bits/x86_64.yml +++ b/dashboard/config/linux/bits/x86_64.yml @@ -44,6 +44,10 @@ config: - MCORE2 - BASE_FULL + # 32-on-64 support (compat). + - IA32_EMULATION + - X86_X32: [-baseline] + # Moved from legacy config, reason for enabling is unknown. - KALLSYMS_ABSOLUTE_PERCPU - X86_MSR diff --git a/dashboard/config/linux/chromeos-5.4.config b/dashboard/config/linux/chromeos-5.4.config index c6c4d24dc..7475a67a8 100644 --- a/dashboard/config/linux/chromeos-5.4.config +++ b/dashboard/config/linux/chromeos-5.4.config @@ -591,7 +591,7 @@ CONFIG_AMD_NB=y # Binary Emulations # CONFIG_IA32_EMULATION=y -# CONFIG_X86_X32 is not set +CONFIG_X86_X32=y CONFIG_COMPAT_32=y CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y diff --git a/dashboard/config/linux/upstream-usb.config b/dashboard/config/linux/upstream-usb.config index e3c1e73fe..fbbc08759 100644 --- a/dashboard/config/linux/upstream-usb.config +++ b/dashboard/config/linux/upstream-usb.config @@ -603,7 +603,7 @@ CONFIG_AMD_NB=y # Binary Emulations # CONFIG_IA32_EMULATION=y -# CONFIG_X86_X32 is not set +CONFIG_X86_X32=y CONFIG_COMPAT_32=y CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y |