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

Commit 1fc8b4ef authored by David Gibson's avatar David Gibson Committed by Paul Mackerras
Browse files

[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: default avatarDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent de2d3dbd

include/asm-powerpc/numnodes.h

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#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 */

include/asm-ppc64/sparsemem.h→include/asm-powerpc/sparsemem.h

+3 −3
Original line number Diff line number Diff line 
#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 */

include/asm-ppc64/numnodes.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#ifndef _ASM_MAX_NUMNODES_H

#define _ASM_MAX_NUMNODES_H



/* Max 16 Nodes */

#define NODES_SHIFT	4



#endif /* _ASM_MAX_NUMNODES_H */