diff options
author | Paul Bolle <pebolle@tiscali.nl> | 2018-11-13 17:57:21 +0100 |
---|---|---|
committer | Jeremy Cline <jcline@redhat.com> | 2018-11-30 10:33:47 -0500 |
commit | 0c4937f9e4414ed4ccdfbf1eee79a90ae37796d0 (patch) | |
tree | 868d35e3c14d4cc9080c679fb72ce7b0dec86c9d | |
parent | 913381ea2fed4e15432fdb6d2c734632f6c0212b (diff) | |
download | kernel-0c4937f9e4414ed4ccdfbf1eee79a90ae37796d0.tar.gz kernel-0c4937f9e4414ed4ccdfbf1eee79a90ae37796d0.tar.xz kernel-0c4937f9e4414ed4ccdfbf1eee79a90ae37796d0.zip |
configs: use CONFIG_UNWINDER_ORC only in x86/x86_64
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@tiscali.nl>
-rw-r--r-- | configs/fedora/generic/x86/x86_64/CONFIG_UNWINDER_ORC (renamed from configs/fedora/generic/CONFIG_UNWINDER_ORC) | 0 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 1 | ||||
-rw-r--r-- | kernel-aarch64.config | 1 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 1 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 1 | ||||
-rw-r--r-- | kernel-armv7hl-lpae.config | 1 | ||||
-rw-r--r-- | kernel-armv7hl.config | 1 | ||||
-rw-r--r-- | kernel-i686-debug.config | 1 | ||||
-rw-r--r-- | kernel-i686.config | 1 | ||||
-rw-r--r-- | kernel-ppc64le-debug.config | 1 | ||||
-rw-r--r-- | kernel-ppc64le.config | 1 | ||||
-rw-r--r-- | kernel-s390x-debug.config | 1 | ||||
-rw-r--r-- | kernel-s390x.config | 1 |
13 files changed, 0 insertions, 12 deletions
diff --git a/configs/fedora/generic/CONFIG_UNWINDER_ORC b/configs/fedora/generic/x86/x86_64/CONFIG_UNWINDER_ORC index 6b6908419..6b6908419 100644 --- a/configs/fedora/generic/CONFIG_UNWINDER_ORC +++ b/configs/fedora/generic/x86/x86_64/CONFIG_UNWINDER_ORC diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 5753a5226..5e7fe2043 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -6419,7 +6419,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-aarch64.config b/kernel-aarch64.config index f55e13ceb..d698088f3 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -6395,7 +6395,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-armv7hl-debug.config b/kernel-armv7hl-debug.config index 8db5db6ab..909b73b57 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -6875,7 +6875,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-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 0968e946b..b7304bfa0 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -6459,7 +6459,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-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 1a6825908..d028be45d 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -6435,7 +6435,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-armv7hl.config b/kernel-armv7hl.config index 6447f7b0b..9d6f08154 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -6851,7 +6851,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-i686-debug.config b/kernel-i686-debug.config index e19d0e557..5fa9b6860 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -6071,7 +6071,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 9189a14b7..33c2b4506 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -6046,7 +6046,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 117d0745e..ffadfb838 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -5744,7 +5744,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 51a4b2e06..212eb6ba6 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -5717,7 +5717,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 e1a861942..b3a036e05 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -5638,7 +5638,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 071ee9e4f..fb71c3cea 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -5611,7 +5611,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 |