Re: 2.6.17-mm4

["Rafael J. Wysocki" <rjw@sisk.pl>]

On Thursday 29 June 2006 10:36, Andrew Morton wrote:
> 
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.17/2.6.17-mm4/
> 
> 
> - The RAID patches have been dropped due to testing failures in -mm3.
> 
> - The SCSI Attached Storage tree (git-sas.patch) has been restored.

It doesn't compile for me on a non-SMP x86_64.  Appended is a patch that fixes
this (it only reverts one change between -mm3 and -mm4, though).

Greetings,
Rafael


 arch/i386/kernel/alternative.c |    6 ------
 1 files changed, 6 deletions(-)

Index: linux-2.6.17-mm4/arch/i386/kernel/alternative.c
===================================================================
--- linux-2.6.17-mm4.orig/arch/i386/kernel/alternative.c
+++ linux-2.6.17-mm4/arch/i386/kernel/alternative.c
@@ -168,7 +168,6 @@ void apply_alternatives(struct alt_instr
 	}
 }
 
-#ifdef CONFIG_SMP
 static void alternatives_smp_save(struct alt_instr *start, struct alt_instr *end)
 {
 	struct alt_instr *a;
@@ -338,8 +337,6 @@ void alternatives_smp_switch(int smp)
 	}
 	spin_unlock_irqrestore(&smp_alt, flags);
 }
-#endif
-
 
 void __init alternative_instructions(void)
 {
@@ -352,8 +349,6 @@ void __init alternative_instructions(voi
 	}
 	apply_alternatives(__alt_instructions, __alt_instructions_end);
 
-#ifdef CONFIG_SMP
-
 	/* switch to patch-once-at-boottime-only mode and free the
 	 * tables in case we know the number of CPUs will never ever
 	 * change */
@@ -385,5 +380,4 @@ void __init alternative_instructions(voi
 					    _text, _etext);
 		alternatives_smp_switch(0);
 	}
-#endif
 }