From 0105c365d7e1dcc2fb83de7e30799e719d79976b Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Thu, 5 May 2005 16:15:11 -0700
Subject: [PATCH] --- yaml --- r: 971 b: refs/heads/master c:
 7d12e522ba13ce718b7ec32b75803dece8adb072 h: refs/heads/master i:   969:
 2e8ac8800c9eb64d2ae2d6110855aea3300d6562   967:
 89470a669560500aed1c12b41d8036b791b931d5 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/ia64/Kconfig  | 4 ++++
 trunk/arch/ppc/Kconfig   | 4 ++++
 trunk/arch/ppc64/Kconfig | 4 ++++
 trunk/kernel/Makefile    | 2 +-
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 344d6b78e13a..e427d3d06759 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 696c2b9f97c2439e9fb299650041ec750df46865
+refs/heads/master: 7d12e522ba13ce718b7ec32b75803dece8adb072
diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig
index ce13ad689d19..3ad2c4af099c 100644
--- a/trunk/arch/ia64/Kconfig
+++ b/trunk/arch/ia64/Kconfig
@@ -46,6 +46,10 @@ config GENERIC_IOMAP
 	bool
 	default y
 
+config SCHED_NO_NO_OMIT_FRAME_POINTER
+	bool
+	default y
+
 choice
 	prompt "System type"
 	default IA64_GENERIC
diff --git a/trunk/arch/ppc/Kconfig b/trunk/arch/ppc/Kconfig
index ff04dcd30200..d0d94e56b90b 100644
--- a/trunk/arch/ppc/Kconfig
+++ b/trunk/arch/ppc/Kconfig
@@ -43,6 +43,10 @@ config GENERIC_NVRAM
 	bool
 	default y
 
+config SCHED_NO_NO_OMIT_FRAME_POINTER
+	bool
+	default y
+
 source "init/Kconfig"
 
 menu "Processor"
diff --git a/trunk/arch/ppc64/Kconfig b/trunk/arch/ppc64/Kconfig
index f5508abf1188..257ff66d83cf 100644
--- a/trunk/arch/ppc64/Kconfig
+++ b/trunk/arch/ppc64/Kconfig
@@ -40,6 +40,10 @@ config COMPAT
 	bool
 	default y
 
+config SCHED_NO_NO_OMIT_FRAME_POINTER
+	bool
+	default y
+
 # We optimistically allocate largepages from the VM, so make the limit
 # large enough (16MB). This badly named config option is actually
 # max order + 1
diff --git a/trunk/kernel/Makefile b/trunk/kernel/Makefile
index eb88b446c2cc..b01d26fe8db7 100644
--- a/trunk/kernel/Makefile
+++ b/trunk/kernel/Makefile
@@ -29,7 +29,7 @@ obj-$(CONFIG_SYSFS) += ksysfs.o
 obj-$(CONFIG_GENERIC_HARDIRQS) += irq/
 obj-$(CONFIG_SECCOMP) += seccomp.o
 
-ifneq ($(CONFIG_IA64),y)
+ifneq ($(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER),y)
 # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is
 # needed for x86 only.  Why this used to be enabled for all architectures is beyond
 # me.  I suspect most platforms don't need this, but until we know that for sure