[linux] 02/02: mm: hugetlb: allow hugepages_supported to be architecture specific

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch jessie-security
in repository linux.

commit 9c61c1fdb70563cdbbdd890f13dfb6c57e881406
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue May 31 02:38:31 2016 +0100

    mm: hugetlb: allow hugepages_supported to be architecture specific
    
    This is a prerequisite for "x86/mm/xen: Suppress hugetlbfs in PV guests".
---
 debian/changelog                                   |  1 +
 ...allow-hugepages_supported-to-be-architect.patch | 50 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 52 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 63ecab5..2213da5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ linux (3.16.7-ckt25-2+deb8u1) UNRELEASED; urgency=medium
     - cdc_ncm: do not call usbnet_link_change from cdc_ncm_bind
     - usbnet: cleanup after bind() in probe()
   * atl2: Disable unimplemented scatter/gather feature (CVE-2016-2117)
+  * mm: hugetlb: allow hugepages_supported to be architecture specific
 
   [ Salvatore Bonaccorso ]
   * [x86] USB: usbip: fix potential out-of-bounds write (CVE-2016-3955)
diff --git a/debian/patches/bugfix/all/mm-hugetlb-allow-hugepages_supported-to-be-architect.patch b/debian/patches/bugfix/all/mm-hugetlb-allow-hugepages_supported-to-be-architect.patch
new file mode 100644
index 0000000..9b7eb77
--- /dev/null
+++ b/debian/patches/bugfix/all/mm-hugetlb-allow-hugepages_supported-to-be-architect.patch
@@ -0,0 +1,50 @@
+From: Dominik Dingel <dingel at linux.vnet.ibm.com>
+Date: Fri, 17 Jul 2015 16:23:37 -0700
+Subject: mm: hugetlb: allow hugepages_supported to be architecture specific
+Origin: https://git.kernel.org/linus/2531c8cf56a640cd7d17057df8484e570716a450
+
+s390 has a constant hugepage size, by setting HPAGE_SHIFT we also change
+e.g. the pageblock_order, which should be independent in respect to
+hugepage support.
+
+With this patch every architecture is free to define how to check
+for hugepage support.
+
+Signed-off-by: Dominik Dingel <dingel at linux.vnet.ibm.com>
+Acked-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
+Cc: Heiko Carstens <heiko.carstens at de.ibm.com>
+Cc: Christian Borntraeger <borntraeger at de.ibm.com>
+Cc: Michael Holzheu <holzheu at linux.vnet.ibm.com>
+Cc: Gerald Schaefer <gerald.schaefer at de.ibm.com>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ include/linux/hugetlb.h | 17 ++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
+
+--- a/include/linux/hugetlb.h
++++ b/include/linux/hugetlb.h
+@@ -416,15 +416,14 @@ static inline spinlock_t *huge_pte_lockp
+ 	return &mm->page_table_lock;
+ }
+ 
+-static inline bool hugepages_supported(void)
+-{
+-	/*
+-	 * Some platform decide whether they support huge pages at boot
+-	 * time. On these, such as powerpc, HPAGE_SHIFT is set to 0 when
+-	 * there is no such support
+-	 */
+-	return HPAGE_SHIFT != 0;
+-}
++#ifndef hugepages_supported
++/*
++ * Some platform decide whether they support huge pages at boot
++ * time. Some of them, such as powerpc, set HPAGE_SHIFT to 0
++ * when there is no such support
++ */
++#define hugepages_supported() (HPAGE_SHIFT != 0)
++#endif
+ 
+ #else	/* CONFIG_HUGETLB_PAGE */
+ struct hstate {};
diff --git a/debian/patches/series b/debian/patches/series
index a776b50..90634eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -673,6 +673,7 @@ bugfix/x86/x86-mm-32-enable-full-randomization-on-i386-and-x86_32.patch
 bugfix/all/cdc_ncm-do-not-call-usbnet_link_change-from-cdc_ncm_.patch
 bugfix/all/usbnet-cleanup-after-bind-in-probe.patch
 bugfix/all/atl2-disable-unimplemented-scatter-gather-feature.patch
+bugfix/all/mm-hugetlb-allow-hugepages_supported-to-be-architect.patch
 bugfix/x86/x86-mm-xen-Suppress-hugetlbfs-in-PV-guests.patch
 bugfix/all/get_rock_ridge_filename-handle-malformed-NM-entries.patch
 bugfix/all/fs-pnode.c-treat-zero-mnt_group_id-s-as-unequal.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git