[folded-merged] include-define-__phys_to_pfn-as-phys_pfn-fix-2.patch removed from -mm tree

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

 



The patch titled
     Subject: mm: include linux/pfn.h for PHYS_PFN definition
has been removed from the -mm tree.  Its filename was
     include-define-__phys_to_pfn-as-phys_pfn-fix-2.patch

This patch was dropped because it was folded into include-define-__phys_to_pfn-as-phys_pfn.patch

------------------------------------------------------
From: Arnd Bergmann <arnd@xxxxxxxx>
Subject: mm: include linux/pfn.h for PHYS_PFN definition

A change to asm-generic/memory_model.h caused a new build error
in some configurations:

mach-clps711x/common.c:39:10: error: implicit declaration of function 'PHYS_PFN'
   .pfn  = __phys_to_pfn(CLPS711X_PHYS_BASE),

This includes the linux/pfn.h header from the same file to avoid the
error.

Fixes: bf1c6c9895de ("mm: add PHYS_PFN, use it in __phys_to_pfn()")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Chen Gang <xili_gchen_5257@xxxxxxxxxxx>
Cc: Chen Gang <gang.chen.5i5j@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 include/asm-generic/memory_model.h |    2 ++
 1 file changed, 2 insertions(+)

diff -puN include/asm-generic/memory_model.h~include-define-__phys_to_pfn-as-phys_pfn-fix-2 include/asm-generic/memory_model.h
--- a/include/asm-generic/memory_model.h~include-define-__phys_to_pfn-as-phys_pfn-fix-2
+++ a/include/asm-generic/memory_model.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_MEMORY_MODEL_H
 #define __ASM_MEMORY_MODEL_H
 
+#include <linux/pfn.h>
+
 #ifndef __ASSEMBLY__
 
 #if defined(CONFIG_FLATMEM)
_

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

logfs-fix-logfs-build-errors-and-dependencies.patch
include-define-__phys_to_pfn-as-phys_pfn.patch
arm-thp-remove-infrastructure-for-handling-splitting-pmds-fix.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



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

  Powered by Linux