66d1c29655
Refreshed all patches. Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
71 lines
2.5 KiB
Diff
71 lines
2.5 KiB
Diff
--- a/arch/x86/Kconfig.debug
|
|
+++ b/arch/x86/Kconfig.debug
|
|
@@ -276,20 +276,6 @@ config CPA_DEBUG
|
|
---help---
|
|
Do change_page_attr() self-tests every 30 seconds.
|
|
|
|
-config OPTIMIZE_INLINING
|
|
- bool "Allow gcc to uninline functions marked 'inline'"
|
|
- ---help---
|
|
- This option determines if the kernel forces gcc to inline the functions
|
|
- developers have marked 'inline'. Doing so takes away freedom from gcc to
|
|
- do what it thinks is best, which is desirable for the gcc 3.x series of
|
|
- compilers. The gcc 4.x series have a rewritten inlining algorithm and
|
|
- enabling this option will generate a smaller kernel there. Hopefully
|
|
- this algorithm is so good that allowing gcc 4.x and above to make the
|
|
- decision will become the default in the future. Until then this option
|
|
- is there to test gcc for this.
|
|
-
|
|
- If unsure, say N.
|
|
-
|
|
config DEBUG_ENTRY
|
|
bool "Debug low-level entry code"
|
|
depends on DEBUG_KERNEL
|
|
--- a/lib/Kconfig.debug
|
|
+++ b/lib/Kconfig.debug
|
|
@@ -150,6 +150,20 @@ endmenu # "printk and dmesg options"
|
|
|
|
menu "Compile-time checks and compiler options"
|
|
|
|
+config OPTIMIZE_INLINING
|
|
+ bool "Allow gcc to uninline functions marked 'inline'"
|
|
+ ---help---
|
|
+ This option determines if the kernel forces gcc to inline the functions
|
|
+ developers have marked 'inline'. Doing so takes away freedom from gcc to
|
|
+ do what it thinks is best, which is desirable for the gcc 3.x series of
|
|
+ compilers. The gcc 4.x series have a rewritten inlining algorithm and
|
|
+ enabling this option will generate a smaller kernel there. Hopefully
|
|
+ this algorithm is so good that allowing gcc 4.x and above to make the
|
|
+ decision will become the default in the future. Until then this option
|
|
+ is there to test gcc for this.
|
|
+
|
|
+ If unsure, say N.
|
|
+
|
|
config DEBUG_INFO
|
|
bool "Compile the kernel with debug info"
|
|
depends on DEBUG_KERNEL && !COMPILE_TEST
|
|
--- a/arch/x86/Kconfig
|
|
+++ b/arch/x86/Kconfig
|
|
@@ -306,9 +306,6 @@ config ZONE_DMA32
|
|
config AUDIT_ARCH
|
|
def_bool y if X86_64
|
|
|
|
-config ARCH_SUPPORTS_OPTIMIZED_INLINING
|
|
- def_bool y
|
|
-
|
|
config ARCH_SUPPORTS_DEBUG_PAGEALLOC
|
|
def_bool y
|
|
|
|
--- a/include/linux/compiler_types.h
|
|
+++ b/include/linux/compiler_types.h
|
|
@@ -264,8 +264,7 @@ struct ftrace_likely_data {
|
|
* of extern inline functions at link time.
|
|
* A lot of inline functions can cause havoc with function tracing.
|
|
*/
|
|
-#if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \
|
|
- !defined(CONFIG_OPTIMIZE_INLINING)
|
|
+#if !defined(CONFIG_OPTIMIZE_INLINING)
|
|
#define inline \
|
|
inline __attribute__((always_inline, unused)) notrace __gnu_inline
|
|
#else
|