[folded-merged] hugetlb-introduce-generic-version-of-huge_ptep_get-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: hugetlb: fix ARM 3level page tables
has been removed from the -mm tree.  Its filename was
     hugetlb-introduce-generic-version-of-huge_ptep_get-fix.patch

This patch was dropped because it was folded into hugetlb-introduce-generic-version-of-huge_ptep_get.patch

------------------------------------------------------
From: Arnd Bergmann <arnd@xxxxxxxx>
Subject: hugetlb: fix ARM 3level page tables

The check for __HAVE_ARCH_HUGE_PTEP_GET comes before the definition,
leading to an extraneous definition of huge_ptep_get:

In file included from arch/arm/include/asm/hugetlb.h:28,
                 from include/linux/hugetlb.h:456,
                 from arch/arm/kvm/../../../virt/kvm/arm/mmu.c:22:
arch/arm/include/asm/hugetlb-3level.h:33:21: error: redefinition of 'huge_ptep_get'
 static inline pte_t huge_ptep_get(pte_t *ptep)

Change the header file inclusions to be in the correct order for
this to work.

Link: http://lkml.kernel.org/r/20181005161722.904274-1-arnd@xxxxxxxx
Fixes: bb1d18ffc7ae ("hugetlb: introduce generic version of huge_ptep_get")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Alexandre Ghiti <alex@xxxxxxxx>
Cc: Luiz Capitulino <lcapitulino@xxxxxxxxxx>
Cc: Mike Kravetz <mike.kravetz@xxxxxxxxxx>
Cc: Helge Deller <deller@xxxxxx>
Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
Cc: Paul Burton <paul.burton@xxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---


--- a/arch/arm/include/asm/hugetlb.h~hugetlb-introduce-generic-version-of-huge_ptep_get-fix
+++ a/arch/arm/include/asm/hugetlb.h
@@ -23,9 +23,8 @@
 #define _ASM_ARM_HUGETLB_H
 
 #include <asm/page.h>
-#include <asm-generic/hugetlb.h>
-
 #include <asm/hugetlb-3level.h>
+#include <asm-generic/hugetlb.h>
 
 static inline int is_hugepage_only_range(struct mm_struct *mm,
 					 unsigned long addr, unsigned long len)
_

Patches currently in -mm which might be from arnd@xxxxxxxx are

hugetlb-introduce-generic-version-of-huge_ptep_get.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux