From d03c8b9c30d937942c553fe783635c349627760f Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Sun, 6 May 2012 19:57:42 -0500
Subject: [PATCH] 3.4-rc6-d3 release
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patch.sh | 2 +-
patches/defconfig | 8 +++++---
patches/ref_omap2plus_defconfig | 3 ++-
version.sh | 4 ++--
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/patch.sh b/patch.sh
index 03a982de0..6968e02f3 100644
--- a/patch.sh
+++ b/patch.sh
@@ -104,7 +104,7 @@ omap_fixes () {
git am "${DIR}/patches/omap_fixes/0002-OMAP2-UART-Remove-cpu-checks-for-populating-errata-f.patch"
git am "${DIR}/patches/omap_fixes/0003-OMAP2-UART-enable-tx-wakeup-bit-for-wer-reg.patch"
git am "${DIR}/patches/omap_fixes/0004-OMAP2-UART-replace-omap34xx-omap4xx-cpu-checks-with-.patch"
- git am "${DIR}/patches/omap_fixes/0005-mfd-cpu_is_omap3430-wasnt-defined.patch"
+# git am "${DIR}/patches/omap_fixes/0005-mfd-cpu_is_omap3430-wasnt-defined.patch"
#breaks beagle c4, needs fix..
# git am "${DIR}/patches/omap_fixes/0001-Fix-sprz319-erratum-2.1.patch"
diff --git a/patches/defconfig b/patches/defconfig
index 58c1d2abf..97a1b8950 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -153,9 +153,10 @@ CONFIG_PERF_EVENTS=y
CONFIG_PERF_COUNTERS=y
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
CONFIG_COMPAT_BRK=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
# CONFIG_SLOB is not set
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
@@ -4059,7 +4060,8 @@ CONFIG_SCHED_DEBUG=y
CONFIG_SCHEDSTATS=y
CONFIG_TIMER_STATS=y
# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
# CONFIG_DEBUG_KMEMLEAK is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
# CONFIG_RT_MUTEX_TESTER is not set
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index 48a3c9e9f..983051a71 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.0-rc5 Kernel Configuration
+# Linux/arm 3.4.0-rc6 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -423,6 +423,7 @@ CONFIG_ARM_L1_CACHE_SHIFT=6
CONFIG_ARM_DMA_MEM_BUFFERABLE=y
CONFIG_ARM_NR_BANKS=8
CONFIG_MULTI_IRQ_HANDLER=y
+# CONFIG_ARM_ERRATA_326103 is not set
CONFIG_ARM_ERRATA_411920=y
# CONFIG_ARM_ERRATA_430973 is not set
# CONFIG_ARM_ERRATA_458693 is not set
diff --git a/version.sh b/version.sh
index 2aa48f53c..1c5dd9002 100644
--- a/version.sh
+++ b/version.sh
@@ -9,9 +9,9 @@ unset BUILD
#for x.x-rcX
RC_KERNEL=3.4
-RC_PATCH=-rc5
+RC_PATCH=-rc6
-ABI=2.2
+ABI=3
BUILD=d${ABI}
--
GitLab