[kernel] r19899 - in dists/trunk/linux/debian: . patches patches/bugfix/mips

[Ben Hutchings]

Author: benh
Date: Mon Mar  4 04:18:32 2013
New Revision: 19899

Log:
[mips,mipsel] Add dependencies for HAVE_ARCH_TRANSPARENT_HUGEPAGE (fixes FTBFS)

Added:
   dists/trunk/linux/debian/patches/bugfix/mips/mips-add-dependencies-for-have_arch_transparent_hugepage.patch
Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/patches/series

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Mon Mar  4 02:07:31 2013	(r19898)
+++ dists/trunk/linux/debian/changelog	Mon Mar  4 04:18:32 2013	(r19899)
@@ -11,6 +11,8 @@
   * net: Enable USB_NET_CDC_MBIM as module (Closes: #701869)
   * mfd,mmc,memstick: Enable MFD_RTSX_PCI, MMC_REALTEK_PCI and
     MEMSTICK_REALTEK_PCI as modules, replacing RTS_PSTOR (Closes: #702108)
+  * [mips,mipsel] Add dependencies for HAVE_ARCH_TRANSPARENT_HUGEPAGE
+    (fixes FTBFS)
 
   [ Aurelien Jarno ]
   * [mips/octeon] Change HW_RANDOM and HW_RANDOM_OCTEON to modules.

Added: dists/trunk/linux/debian/patches/bugfix/mips/mips-add-dependencies-for-have_arch_transparent_hugepage.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/patches/bugfix/mips/mips-add-dependencies-for-have_arch_transparent_hugepage.patch	Mon Mar  4 04:18:32 2013	(r19899)
@@ -0,0 +1,24 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: MIPS: Add dependencies for HAVE_ARCH_TRANSPARENT_HUGEPAGE
+Date: Mon, 04 Mar 2013 03:54:29 +0000
+
+The MIPS implementation of transparent huge-pages (THP) is 64-bit only,
+and of course also requires that the CPU supports huge-pages.
+
+Currently it's entirely possible to enable THP in other configurations,
+which then fail to build due to pfn_pmd() not being defined.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Cc: David Daney <david.daney at cavium.com>
+---
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -19,7 +19,7 @@ config MIPS
+ 	select HAVE_KRETPROBES
+ 	select HAVE_DEBUG_KMEMLEAK
+ 	select ARCH_BINFMT_ELF_RANDOMIZE_PIE
+-	select HAVE_ARCH_TRANSPARENT_HUGEPAGE
++	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT
+ 	select RTC_LIB if !MACH_LOONGSON
+ 	select GENERIC_ATOMIC64 if !64BIT
+ 	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

Modified: dists/trunk/linux/debian/patches/series
==============================================================================
--- dists/trunk/linux/debian/patches/series	Mon Mar  4 02:07:31 2013	(r19898)
+++ dists/trunk/linux/debian/patches/series	Mon Mar  4 04:18:32 2013	(r19899)
@@ -79,3 +79,4 @@
 bugfix/all/mm-Try-harder-to-allocate-vmemmap-blocks.patch
 bugfix/x86/x86-efi-Make-noefi-really-disable-EFI-runtime-serivc.patch
 features/all/alx/alx-update-for-3.8.patch
+bugfix/mips/mips-add-dependencies-for-have_arch_transparent_hugepage.patch