From adff6738a39b1e6b6602d2711bcfbded414d1f7f Mon Sep 17 00:00:00 2001 From: Yoichi Yuasa Date: Thu, 19 Jul 2012 09:11:15 +0200 Subject: [PATCH] --- yaml --- r: 312125 b: refs/heads/master c: 7ee91de45a9a841ac59d597901e984b859b31bbe h: refs/heads/master i: 312123: 5deacfd6bfb48f834dce1cecf61b5a11674cf810 v: v3 --- [refs] | 2 +- trunk/arch/mips/Kconfig | 1 + trunk/arch/mips/cavium-octeon/Kconfig | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 395e01303672..9cba146767c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b96b62db8cec46693e192f31c2c14147212530fc +refs/heads/master: 7ee91de45a9a841ac59d597901e984b859b31bbe diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig index 09ab87ee6fef..5eb8c932fe53 100644 --- a/trunk/arch/mips/Kconfig +++ b/trunk/arch/mips/Kconfig @@ -1423,6 +1423,7 @@ config CPU_SB1 config CPU_CAVIUM_OCTEON bool "Cavium Octeon processor" depends on SYS_HAS_CPU_CAVIUM_OCTEON + select ARCH_SPARSEMEM_ENABLE select CPU_HAS_PREFETCH select CPU_SUPPORTS_64BIT_KERNEL select SYS_SUPPORTS_SMP diff --git a/trunk/arch/mips/cavium-octeon/Kconfig b/trunk/arch/mips/cavium-octeon/Kconfig index f9e275a50d98..2f4f6d5e05b6 100644 --- a/trunk/arch/mips/cavium-octeon/Kconfig +++ b/trunk/arch/mips/cavium-octeon/Kconfig @@ -82,10 +82,6 @@ config CAVIUM_OCTEON_LOCK_L2_MEMCPY help Lock the kernel's implementation of memcpy() into L2. -config ARCH_SPARSEMEM_ENABLE - def_bool y - select SPARSEMEM_STATIC - config IOMMU_HELPER bool