Merge http://linux-isdn.bkbits.net/linux-2.5.misc

into home.transmeta.com:/home/torvalds/v2.5/linux

arch/i386/kernel/bluesmoke.c

@@ -33,9 +33,9 @@ static void inline flush_all (void)
  *	P4/Xeon Thermal transition interrupt handler
  */
 
+#ifdef CONFIG_X86_LOCAL_APIC
 static void intel_thermal_interrupt(struct pt_regs *regs)
 {
-#ifdef CONFIG_X86_LOCAL_APIC
 	u32 l, h;
 	unsigned int cpu = smp_processor_id();
 
@@ -48,8 +48,8 @@ static void intel_thermal_interrupt(struct pt_regs *regs)
 	} else {
 		printk(KERN_INFO "CPU#%d: Temperature/speed normal\n", cpu);
 	}
-#endif
 }
+#endif
 
 static void unexpected_thermal_interrupt(struct pt_regs *regs)
 {	

drivers/video/neofb.c

@@ -2365,7 +2365,7 @@ int __init neofb_setup (char *options)
   if (!options || !*options)
     return 0;
 
-  for (this_opt=strtok(options,","); this_opt; this_opt=strtok(NULL,","))
+  while ((this_opt = strsep(&options,",")) != NULL)
     {
       if (!*this_opt) continue;
 

init/main.c

@@ -272,6 +272,10 @@ static void __init smp_init(void)
 #define smp_init()	do { } while (0)
 #endif
 
+static inline void setup_per_cpu_areas(void)
+{
+}
+
 #else
 
 #ifdef __GENERIC_PER_CPU
@@ -296,10 +300,6 @@ static void __init setup_per_cpu_areas(void)
 		memcpy(ptr, __per_cpu_start, size);
 	}
 }
-#else
-static inline void setup_per_cpu_areas(void)
-{
-}
 #endif /* !__GENERIC_PER_CPU */
 
 /* Called by boot processor to activate the rest. */