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 595c18bcc..795fbed55 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -6334,7 +6334,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 cb12f2e26..7772dbabf 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -6311,7 +6311,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 3a6393e34..cad15d990 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -6749,7 +6749,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 8e00ea142..42edcda6e 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -6343,7 +6343,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 fc1b8bfb7..310f7a606 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -6321,7 +6321,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 8581468d8..bc2d89dba 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -6727,7 +6727,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 9fa267990..093806947 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -5931,7 +5931,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 0c2dbe40a..42ee7c449 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -5909,7 +5909,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 1c67f03f1..e115707bc 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -5608,7 +5608,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 04e4d19a4..1f7e6f309 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -5584,7 +5584,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 a463ec2e8..56d290d3f 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -5501,7 +5501,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 eff68fce8..1780a6141 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -5477,7 +5477,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