The shipped .config files for i686 have both CONFIG_UNWINDER_ORC and
CONFIG_UNWINDER_FRAME_POINTER set. This is wrong because those .config
files should only have CONFIG_UNWINDER_FRAME_POINTER set. As a result
the build generates
[...]:warning: override: UNWINDER_ORC changes choice state
4 times.
Move CONFIG_UNWINDER_ORC to x86/x86_64 to correct this. Note that this
doesn't change the final .config files that the kernel's build system
actually uses.
Signed-off-by: Paul Bolle <pebolle@xxxxxxxxxx>
---
configs/fedora/generic/{ => x86/x86_64}/CONFIG_UNWINDER_ORC | 0
kernel-aarch64-debug.config | 1 -
kernel-aarch64.config | 1 -
kernel-armv7hl-debug.config | 1 -
kernel-armv7hl-lpae-debug.config | 1 -
kernel-armv7hl-lpae.config | 1 -
kernel-armv7hl.config | 1 -
kernel-i686-debug.config | 1 -
kernel-i686.config | 1 -
kernel-ppc64le-debug.config | 1 -
kernel-ppc64le.config | 1 -
kernel-s390x-debug.config | 1 -
kernel-s390x.config | 1 -
13 files changed, 12 deletions(-)
rename configs/fedora/generic/{ => x86/x86_64}/CONFIG_UNWINDER_ORC (100%)
diff --git a/configs/fedora/generic/CONFIG_UNWINDER_ORC b/configs/fedora/generic/x86/x86_64/CONFIG_UNWINDER_ORC
similarity index 100%
rename from configs/fedora/generic/CONFIG_UNWINDER_ORC
rename to configs/fedora/generic/x86/x86_64/CONFIG_UNWINDER_ORC
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 94ecda994e65..04bd1a5796fd 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -6329,7 +6329,6 @@ CONFIG_UNIX=y
CONFIG_UNUSED_SYMBOLS=y
CONFIG_UNWINDER_ARM=y
# CONFIG_UNWINDER_FRAME_POINTER is not set
-CONFIG_UNWINDER_ORC=y
CONFIG_UPROBE_EVENTS=y
# CONFIG_US5182D is not set
CONFIG_USB_ACM=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index a0cafbaba548..06c36d7c5ede 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -6306,7 +6306,6 @@ CONFIG_UNIX=y
CONFIG_UNUSED_SYMBOLS=y
CONFIG_UNWINDER_ARM=y
# CONFIG_UNWINDER_FRAME_POINTER is not set
-CONFIG_UNWINDER_ORC=y
CONFIG_UPROBE_EVENTS=y
# CONFIG_US5182D is not set
CONFIG_USB_ACM=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 48ecdeae6910..d4dd77a2c136 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -6753,7 +6753,6 @@ CONFIG_UNIX=y
CONFIG_UNUSED_SYMBOLS=y
CONFIG_UNWINDER_ARM=y
# CONFIG_UNWINDER_FRAME_POINTER is not set
-CONFIG_UNWINDER_ORC=y
CONFIG_UPROBE_EVENTS=y
# CONFIG_US5182D is not set
CONFIG_USB_ACM=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 4187a58c38f9..2b68cff8e129 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -6348,7 +6348,6 @@ CONFIG_UNIX=y
CONFIG_UNUSED_SYMBOLS=y
CONFIG_UNWINDER_ARM=y
# CONFIG_UNWINDER_FRAME_POINTER is not set
-CONFIG_UNWINDER_ORC=y
CONFIG_UPROBE_EVENTS=y
# CONFIG_US5182D is not set
CONFIG_USB_ACM=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 7d1cf85fd46c..fe21fc916287 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -6326,7 +6326,6 @@ CONFIG_UNIX=y
CONFIG_UNUSED_SYMBOLS=y
CONFIG_UNWINDER_ARM=y
# CONFIG_UNWINDER_FRAME_POINTER is not set
-CONFIG_UNWINDER_ORC=y
CONFIG_UPROBE_EVENTS=y
# CONFIG_US5182D is not set
CONFIG_USB_ACM=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index eae7cac3cf5a..cad35bf488f6 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -6731,7 +6731,6 @@ CONFIG_UNIX=y
CONFIG_UNUSED_SYMBOLS=y
CONFIG_UNWINDER_ARM=y
# CONFIG_UNWINDER_FRAME_POINTER is not set
-CONFIG_UNWINDER_ORC=y
CONFIG_UPROBE_EVENTS=y
# CONFIG_US5182D is not set
CONFIG_USB_ACM=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 485a254951e1..6706c4434806 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -5946,7 +5946,6 @@ CONFIG_UNIXWARE_DISKLABEL=y
CONFIG_UNIX=y
CONFIG_UNUSED_SYMBOLS=y
CONFIG_UNWINDER_FRAME_POINTER=y
-CONFIG_UNWINDER_ORC=y
CONFIG_UPROBE_EVENTS=y
# CONFIG_US5182D is not set
CONFIG_USB_ACM=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 2904e921a0b0..789aa76bfa3f 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -5924,7 +5924,6 @@ CONFIG_UNIXWARE_DISKLABEL=y
CONFIG_UNIX=y
CONFIG_UNUSED_SYMBOLS=y
CONFIG_UNWINDER_FRAME_POINTER=y
-CONFIG_UNWINDER_ORC=y
CONFIG_UPROBE_EVENTS=y
# CONFIG_US5182D is not set
CONFIG_USB_ACM=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 16fd1d32e812..6039287abcd4 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -5622,7 +5622,6 @@ CONFIG_UNIXWARE_DISKLABEL=y
CONFIG_UNIX=y
CONFIG_UNUSED_SYMBOLS=y
# CONFIG_UNWINDER_FRAME_POINTER is not set
-CONFIG_UNWINDER_ORC=y
CONFIG_UPROBE_EVENTS=y
# CONFIG_US5182D is not set
CONFIG_USB_ACM=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 8688dbf59788..dde03c30a225 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -5598,7 +5598,6 @@ CONFIG_UNIXWARE_DISKLABEL=y
CONFIG_UNIX=y
CONFIG_UNUSED_SYMBOLS=y
# CONFIG_UNWINDER_FRAME_POINTER is not set
-CONFIG_UNWINDER_ORC=y
CONFIG_UPROBE_EVENTS=y
# CONFIG_US5182D is not set
CONFIG_USB_ACM=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index db9a3403eef9..3960741b55e0 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -5515,7 +5515,6 @@ CONFIG_UNIXWARE_DISKLABEL=y
CONFIG_UNIX=y
CONFIG_UNUSED_SYMBOLS=y
# CONFIG_UNWINDER_FRAME_POINTER is not set
-CONFIG_UNWINDER_ORC=y
CONFIG_UPROBE_EVENTS=y
# CONFIG_US5182D is not set
CONFIG_USB_ACM=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index d3aab71f6520..7263dd749825 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -5491,7 +5491,6 @@ CONFIG_UNIXWARE_DISKLABEL=y
CONFIG_UNIX=y
CONFIG_UNUSED_SYMBOLS=y
# CONFIG_UNWINDER_FRAME_POINTER is not set
-CONFIG_UNWINDER_ORC=y
CONFIG_UPROBE_EVENTS=y
# CONFIG_US5182D is not set
CONFIG_USB_ACM=m
--
2.17.2
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
