Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1421232

[PATCH 3.16 040/114] s390/hugetlb: add hugepages_supported define

Show all headers | View raw

3.16.36-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Dominik Dingel <dingel@linux.vnet.ibm.com>

commit 7f9be77555bb2e52de84e9dddf7b4eb20cc6e171 upstream.

On s390 we only can enable hugepages if the underlying hardware/hypervisor
also does support this.  Common code now would assume this to be
signaled by setting HPAGE_SHIFT to 0.  But on s390, where we only
support one hugepage size, there is a link between HPAGE_SHIFT and
pageblock_order.

So instead of setting HPAGE_SHIFT to 0, we will implement the check for
the hardware capability.

Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 arch/s390/include/asm/hugetlb.h | 1 +
 1 file changed, 1 insertion(+)

--- a/arch/s390/include/asm/hugetlb.h
+++ b/arch/s390/include/asm/hugetlb.h
@@ -14,6 +14,7 @@
 
 #define is_hugepage_only_range(mm, addr, len)	0
 #define hugetlb_free_pgd_range			free_pgd_range
+#define hugepages_supported()			(MACHINE_HAS_HPAGE)
 
 void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
 		     pte_t *ptep, pte_t pte);

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 3.16 000/114] 3.16.36-rc1 review Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  [PATCH 3.16 014/114] kvm: x86: do not leak guest xcr0 into host  interrupt handlers Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  [PATCH 3.16 045/114] batman-adv: Reduce refcnt of removed router  when updating route Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  [PATCH 3.16 040/114] s390/hugetlb: add hugepages_supported define Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  [PATCH 3.16 013/114] assoc_array: don't call compare_object() on  a node Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  [PATCH 3.16 027/114] crypto: ccp - Prevent information leakage on  export Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  [PATCH 3.16 069/114] tracing: Don't display trigger file for  events that can't be enabled Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  [PATCH 3.16 012/114] drm/i915: Exit cherryview_irq_handler()  after one pass Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
    Re: [PATCH 3.16 012/114] drm/i915: Exit cherryview_irq_handler()  after one pass Ville Syrjälä <ville.syrjala@linux.intel.com> - 2016-06-14 12:50 +0200
      Re: [PATCH 3.16 012/114] drm/i915: Exit cherryview_irq_handler()  after one pass Ben Hutchings <ben@decadent.org.uk> - 2016-06-14 13:40 +0200
        Re: [PATCH 3.16 012/114] drm/i915: Exit cherryview_irq_handler()  after one pass Ville Syrjälä <ville.syrjala@linux.intel.com> - 2016-06-14 14:10 +0200
          Re: [PATCH 3.16 012/114] drm/i915: Exit cherryview_irq_handler()  after one pass Ben Hutchings <ben@decadent.org.uk> - 2016-06-14 14:50 +0200
            Re: [PATCH 3.16 012/114] drm/i915: Exit cherryview_irq_handler()  after one pass Ville Syrjälä <ville.syrjala@linux.intel.com> - 2016-06-14 15:10 +0200
  [PATCH 3.16 009/114] Input: gtco - fix crash on detecting device  without endpoints Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  [PATCH 3.16 058/114] mm/huge_memory: replace VM_NO_THP VM_BUG_ON  with actual VMA check Ben Hutchings <ben@decadent.org.uk> - 2016-06-13 21:20 +0200
  Re: [PATCH 3.16 000/114] 3.16.36-rc1 review Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2016-06-13 23:20 +0200
  Re: [PATCH 3.16 000/114] 3.16.36-rc1 review Guenter Roeck <linux@roeck-us.net> - 2016-06-14 04:00 +0200
    Re: [PATCH 3.16 000/114] 3.16.36-rc1 review Ben Hutchings <ben@decadent.org.uk> - 2016-06-14 13:30 +0200

csiph-web