[PATCH] powerpc: Merge (move) numnodes.h and sparsemem.h
The ppc64 versions of numnodes.h and sparsemem.h can be safely moved to asm-powerpc with no changes apart from changing the #define to the standard _ASM_POWERPC_ form. There are no ppc32 versions of these files, because they only have any effect if CONFIG_SPARSEMEM is enabled, which it never can be on ppc32. Built and booted on pSeries (POWER5), built for 32-bit powermac. Signed-off-by: David Gibson <dwg@au1.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
de2d3dbd17
commit
1fc8b4ef4e
7
include/asm-powerpc/numnodes.h
Normal file
7
include/asm-powerpc/numnodes.h
Normal file
|
@ -0,0 +1,7 @@
|
|||
#ifndef _ASM_POWERPC_MAX_NUMNODES_H
|
||||
#define _ASM_POWERPC_MAX_NUMNODES_H
|
||||
|
||||
/* Max 16 Nodes */
|
||||
#define NODES_SHIFT 4
|
||||
|
||||
#endif /* _ASM_POWERPC_MAX_NUMNODES_H */
|
|
@ -1,5 +1,5 @@
|
|||
#ifndef _ASM_PPC64_SPARSEMEM_H
|
||||
#define _ASM_PPC64_SPARSEMEM_H 1
|
||||
#ifndef _ASM_POWERPC_SPARSEMEM_H
|
||||
#define _ASM_POWERPC_SPARSEMEM_H 1
|
||||
|
||||
#ifdef CONFIG_SPARSEMEM
|
||||
/*
|
||||
|
@ -13,4 +13,4 @@
|
|||
|
||||
#endif /* CONFIG_SPARSEMEM */
|
||||
|
||||
#endif /* _ASM_PPC64_SPARSEMEM_H */
|
||||
#endif /* _ASM_POWERPC_SPARSEMEM_H */
|
|
@ -1,7 +0,0 @@
|
|||
#ifndef _ASM_MAX_NUMNODES_H
|
||||
#define _ASM_MAX_NUMNODES_H
|
||||
|
||||
/* Max 16 Nodes */
|
||||
#define NODES_SHIFT 4
|
||||
|
||||
#endif /* _ASM_MAX_NUMNODES_H */
|
Loading…
Reference in a new issue