diff --git a/debian/changelog b/debian/changelog index 672e1f54f..aed714577 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ linux (3.8.1-1~experimental.1) UNRELEASED; urgency=low * 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. diff --git a/debian/patches/bugfix/mips/mips-add-dependencies-for-have_arch_transparent_hugepage.patch b/debian/patches/bugfix/mips/mips-add-dependencies-for-have_arch_transparent_hugepage.patch new file mode 100644 index 000000000..d0450dee2 --- /dev/null +++ b/debian/patches/bugfix/mips/mips-add-dependencies-for-have_arch_transparent_hugepage.patch @@ -0,0 +1,24 @@ +From: Ben Hutchings +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 +Cc: David Daney +--- +--- 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 diff --git a/debian/patches/series b/debian/patches/series index 4883c495f..45108cc0a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -79,3 +79,4 @@ bugfix/x86/drm-i915-add-quirk-to-invert-brightness-on-packard-bell-ncl20.patch 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