Re: [PATCH] fix generic build when CONFIG_SMP=n

["Randy.Dunlap" <rddunlap@osdl.org>]

[-- Attachment #1: Type: text/plain, Size: 2571 bytes --]

On Sun, 15 Aug 2004 21:29:37 -0600 dann frazier wrote:

| On Fri, Aug 13, 2004 at 03:59:59PM -0700, Jesse Barnes wrote:
| > This patch fixes the issues I saw with CONFIG_SMP=n when building a generic 
| > kernel with CONFIG_NUMA=y and CONFIG_DISCONTIGMEM=y.  It's still pretty 
| > rough, but I'd appreciate comments and testing on other platforms.  The 
| > per-cpu fixes are still pretty ugly--I'm sure I'm missing something that 
| > would make abstracting out per_cpu(cpu_info, cpu).node_data = 
| > mem_data[node].node_data much nicer looking.
| > 
| > Fixing the build of generic kernels w/o CONFIG_NUMA or CONFIG_DISCONTIGMEM is 
| > left as an exercise for the reader. :)
| 
| Here's the results of some 2.6.8 boot testing:
| 
| -----------------------------------------------------------------------------
|  generic-no-smp-2    generic_defconfig                                     
|     patch?                delta               machine           results    
| -----------------------------------------------------------------------------
|      No               ITANIUM=y                HP i2000            OK
| -----------------------------------------------------------------------------
|      Yes              ITANIUM=y                HP i2000            OK
| -----------------------------------------------------------------------------
|      Yes              ITANIUM=y                   N/A         build fails [1]
|                       SMP=n
| -----------------------------------------------------------------------------
|      Yes              ITANIUM=y                   N/A         build fails [2]
|                       SMP=n
|                       CYCLONE=n
| -----------------------------------------------------------------------------
|      Yes              ITANIUM=y                   N/A              OK
|                       SMP=n
|                       CYCLONE=n                HP i2000
|                       SERIAL_SGI_L1_CONSOLE=n
| -----------------------------------------------------------------------------
|      Yes                                       HP rx2600           OK
| -----------------------------------------------------------------------------
|      Yes              SMP=n                    HP rx2600           OK
|                       CYCLONE=n
|                       SERIAL_SGI_L1_CONSOLE=n
| [1]
is fixed by the attached patch...

| [2]

[2] is fixed by
http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.8.1/2.6.8.1-mm1/broken-out/fix-sn_console-for-config_smp=n.patch


--
~Randy

[-- Attachment #2: ia64_cyclone_nosmp.patch --]
[-- Type: application/octet-stream, Size: 636 bytes --]


fix ia64 cyclone build errors

Signed-off-by: Randy Dunlap <rddunlap@osdl.org>

diffstat:=
 arch/ia64/kernel/cyclone.c |    3 +++
 1 files changed, 3 insertions(+)

diff -Naurp ./arch/ia64/kernel/cyclone.c~ia64_no_smp ./arch/ia64/kernel/cyclone.c
--- ./arch/ia64/kernel/cyclone.c~ia64_no_smp	Mon Aug 16 14:13:52 2004
+++ ./arch/ia64/kernel/cyclone.c	Mon Aug 16 14:06:26 2004
@@ -1,7 +1,10 @@
+#include <linux/init.h>
 #include <linux/smp.h>
 #include <linux/time.h>
 #include <linux/errno.h>
 
+#include <asm/io.h>
+
 /* IBM Summit (EXA) Cyclone counter code*/
 #define CYCLONE_CBAR_ADDR 0xFEB00CD0
 #define CYCLONE_PMCC_OFFSET 0x51A0