--- zzzz-none-000/linux-2.6.39.4/arch/x86/Kconfig	2011-08-03 19:43:28.000000000 +0000
+++ puma6-arm-6490-729/linux-2.6.39.4/arch/x86/Kconfig	2021-11-10 13:23:10.000000000 +0000
@@ -456,6 +456,50 @@
 	depends on X86_64 || !SPARSEMEM
 	select ARCH_SUPPORTS_MEMORY_FAILURE
 
+menu "Intel Media SOC Gen3 support"
+
+config ARCH_GEN3
+	bool "Enable Intel Media SOC Gen3 support"
+	default y
+	select OF
+	select OF_EARLY_FLATTREE
+	select AVM_PROM_CONFIG
+
+endmenu
+
+config HW_MUTEXES
+        tristate "MUTEX controller support for Intel CE2600 platform"
+        depends on ARCH_GEN3
+        default y
+         ---help---
+          This is the MUTEX controller support for Intel CE2600 platform.
+          If unsure, say Y.
+
+
+choice
+        depends on HW_MUTEXES
+        prompt "MUTEX controller support for Intel CE2600 platform"
+        default MUTEX_FIFO
+        help
+        Allows the configuration of the MUTEX controller working mode in Intel CE platform
+
+       config MUTEX_FIFO
+                bool "FIFO scheduler"
+       help
+        Mutex works in FIFO scheduler mode, which is the default behaviour
+
+       config  MUTEX_NULL
+                bool "Null scheduler"
+        help
+        Mutex works in Null scheduler mode
+
+      config MUTEX_POLLING
+                bool "Polling mode"
+       help
+         works in polling mode, interrupt is disabled
+
+endchoice
+
 config X86_VISWS
 	bool "SGI 320/540 (Visual Workstation)"
 	depends on X86_32 && PCI && X86_MPPARSE && PCI_GODIRECT
@@ -575,6 +619,14 @@
 
 config NO_BOOTMEM
 	def_bool y
+        bool "Disable Bootmem code"
+        ---help---
+          Use early_res directly instead of bootmem before slab is ready.
+                - allocator (buddy) [generic]
+                - early allocator (bootmem) [generic]
+                - very early allocator (reserve_early*()) [x86]
+                - very very early allocator (early brk model) [x86]
+          So reduce one layer between early allocator to final allocator
 
 config MEMTEST
 	bool "Memtest"
@@ -752,6 +804,10 @@
 	  This is purely to save memory - each supported CPU adds
 	  approximately eight kilobytes to the kernel image.
 
+config THREAD_SIZE_ORDER
+    hex "Stack size order (size is 1 << (PAGE_SHIFT + THREAD_SIZE_ORDER))"
+	default "1"
+
 config SCHED_SMT
 	bool "SMT (Hyperthreading) scheduler support"
 	depends on X86_HT