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:28:07 -0500 |
commit | 324d2dc0fc65b075bf91ff2468833425e7bce3e4 (patch) | |
tree | 2b0ee596b7933372fe2657528a00e38b45858554 | |
parent | e2b69afd46f1d4b32c6684b5b4d8c7e780b0372b (diff) | |
download | kernel-324d2dc0fc65b075bf91ff2468833425e7bce3e4.tar.gz kernel-324d2dc0fc65b075bf91ff2468833425e7bce3e4.tar.xz kernel-324d2dc0fc65b075bf91ff2468833425e7bce3e4.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 7d6468353..cca2ae2a0 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -6417,7 +6417,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 b5d13f21b..e9e1d0ee0 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -6393,7 +6393,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 78e27e3c2..c8ae612de 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -6864,7 +6864,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 f6b4d58f6..032dd4a3c 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -6449,7 +6449,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 6fc347238..b61eb83c4 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -6425,7 +6425,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 d11965245..045df843a 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -6840,7 +6840,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 9772c3ba4..6da7c5f8c 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -6060,7 +6060,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 d010d2a2e..b7873f9b4 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -6035,7 +6035,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 585b248ef..f0d70d929 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -5733,7 +5733,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 7b97d018c..a0c6101c0 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -5706,7 +5706,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 6b7364480..8ff037b22 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -5628,7 +5628,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 9b3771fd7..1d5e2d2f4 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -5601,7 +5601,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 |