[ARCH SPLIT]

Get rid of kludges in setup_arch.h and separate them into
setup_arch_pre.h and setup_arch_post.h

arch/i386/generic/setup_arch.h → arch/i386/generic/setup_arch_post.h

-#ifndef SETUP_POST
-#define ARCH_SETUP
-#else
+/* Hook for machine specific memory setup.
+ *
+ * This is included late in kernel/setup.c so that it can make use of all of
+ * the static functions. */
+
 static inline char * __init machine_specific_memory_setup(void)
 {
 	char *who;
@@ -33,4 +35,3 @@ static inline char * __init machine_specific_memory_setup(void)
   	}
 	return who;
 }
-#endif

arch/i386/generic/setup_arch_pre.h

+/* Hook to call BIOS initialisation function */
+
+/* no action for generic */
+
+#define ARCH_SETUP

arch/i386/kernel/setup.c

@@ -117,7 +117,7 @@
 #include <asm/mpspec.h>
 #include <asm/mmu_context.h>
 #include <asm/arch_hooks.h>
-#include "setup_arch.h"
+#include "setup_arch_pre.h"
 
 static inline char * __init machine_specific_memory_setup(void);
 
@@ -2925,8 +2925,7 @@ int __init ppro_with_ram_bug(void)
 	return 0;
 }
 
-#define SETUP_POST
-#include "setup_arch.h"
+#include "setup_arch_post.h"
 	
 /*
  * Local Variables:

arch/i386/visws/setup_arch.h → arch/i386/visws/setup_arch_post.h

-#ifndef SETUP_POST
-#define ARCH_SETUP
-#else
+/* Hook for machine specific memory setup.
+ *
+ * This is included late in kernel/setup.c so that it can make use of all of
+ * the static functions. */
+
 static inline char * __init machine_specific_memory_setup(void)
 {
 	char *who;
@@ -33,4 +35,3 @@ static inline char * __init machine_specific_memory_setup(void)
   	}
 	return who;
 }
-#endif

arch/i386/visws/setup_arch_pre.h

+/* Hook to call BIOS initialisation function */
+
+/* no action for visws */
+
+#define ARCH_SETUP