]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] powerpc: Merge (move) numnodes.h and sparsemem.h
authorDavid Gibson <david@gibson.dropbear.id.au>
Wed, 2 Nov 2005 03:48:36 +0000 (14:48 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 2 Nov 2005 04:25:42 +0000 (15:25 +1100)
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>
include/asm-powerpc/numnodes.h [new file with mode: 0644]
include/asm-powerpc/sparsemem.h [moved from include/asm-ppc64/sparsemem.h with 77% similarity]
include/asm-ppc64/numnodes.h [deleted file]

diff --git a/include/asm-powerpc/numnodes.h b/include/asm-powerpc/numnodes.h
new file mode 100644 (file)
index 0000000..795533a
--- /dev/null
@@ -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 */
similarity index 77%
rename from include/asm-ppc64/sparsemem.h
rename to include/asm-powerpc/sparsemem.h
index c5bd47e57f179fb6d91d25fbede835af3d9f7b0e..1c95ab99deb361615522e453268d4ddedc49a489 100644 (file)
@@ -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 */
diff --git a/include/asm-ppc64/numnodes.h b/include/asm-ppc64/numnodes.h
deleted file mode 100644 (file)
index 75ae0b9..0000000
+++ /dev/null
@@ -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 */