Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fea2efe3 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Remove PFN_TO_NID for !DISCONTIGMEM 



Platform classes need not define PFN_TO_NID when DISCONTIGMEM is
not selected.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1619cca2

include/asm-arm/arch-aaec2000/memory.h

+0 −4
Original line number Diff line number Diff line
@@ -64,10 +64,6 @@ 
#define NODE_MAX_MEM_SHIFT	26

#define NODE_MAX_MEM_SIZE	(1 << NODE_MAX_MEM_SHIFT)



#else



#define PFN_TO_NID(addr)	(0)



#endif /* CONFIG_DISCONTIGMEM */



#endif /* __ASM_ARCH_MEMORY_H */

include/asm-arm/arch-iop3xx/memory.h

+0 −2
Original line number Diff line number Diff line
@@ -36,6 +36,4 @@ 


#endif



#define PFN_TO_NID(addr)	(0)



#endif

include/asm-arm/arch-lh7a40x/memory.h

+0 −4
Original line number Diff line number Diff line
@@ -85,10 +85,6 @@ 
       (((unsigned long)(addr) & 0x01ffffff) >> PAGE_SHIFT)

# endif



#else



# define PFN_TO_NID(addr)	(0)



#endif



#endif

include/asm-arm/arch-omap/memory.h

+0 −1
Original line number Diff line number Diff line
@@ -86,6 +86,5 @@ 


#endif	/* CONFIG_ARCH_OMAP1510 */



#define PHYS_TO_NID(addr) (0)

#endif

include/asm-arm/arch-pxa/memory.h

+0 −4
Original line number Diff line number Diff line
@@ -67,10 +67,6 @@ 
#define LOCAL_MAP_NR(addr) \

	(((unsigned long)(addr) & 0x03ffffff) >> PAGE_SHIFT)



#else



#define PFN_TO_NID(addr)	(0)



#endif



#endif