Commit 4a160053 authored by Philippe Gerum's avatar Philippe Gerum
Browse files

cobalt/blackfin: upgrade I-pipe support

parent 5f57eb3f
......@@ -12,7 +12,7 @@ index af76634..ebff376 100644
comment "Processor and Board Settings"
diff --git a/arch/blackfin/include/asm/ipipe.h b/arch/blackfin/include/asm/ipipe.h
index fe1160f..cc96472 100644
index fe1160f..d988c1f 100644
--- a/arch/blackfin/include/asm/ipipe.h
+++ b/arch/blackfin/include/asm/ipipe.h
@@ -28,7 +28,7 @@
......@@ -32,7 +32,7 @@ index fe1160f..cc96472 100644
-#define IPIPE_MAJOR_NUMBER 1
-#define IPIPE_MINOR_NUMBER 16
-#define IPIPE_PATCH_NUMBER 1
+#define IPIPE_CORE_RELEASE 1
+#define IPIPE_CORE_RELEASE 2
#ifdef CONFIG_SMP
#error "I-pipe/blackfin: SMP not implemented"
......@@ -11722,18 +11722,6 @@ index 1afec32..5803111 100644
goto out;
/*
diff --git a/mm/Kconfig b/mm/Kconfig
index 390214d..0ff2650 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -410,6 +410,7 @@ config NOMMU_INITIAL_TRIM_EXCESS
config TRANSPARENT_HUGEPAGE
bool "Transparent Hugepage Support"
depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE
+ depends on !IPIPE
select COMPACTION
help
Transparent Hugepages allows the kernel to use huge pages and
diff --git a/mm/memory.c b/mm/memory.c
index 2a9e098..46ec4cd 100644
--- a/mm/memory.c
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment