On Thursday, 28 of July 2005 11:58, Andrew Morton wrote: > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc3/2.6.13-rc3-mm3/ > > - Added the anonymous pagefault scalability enhancement patches. > > I remain fairly dubious about this - it seems a fairly specific and > complex piece of work to speed up one extremely specific part of one type of > computer's one type of workload. Surely there's a better way :( > > The patches at present spit warnings or don't compile on lots of > architectures. x86, x86_64, ppc64 and ia64 are OK. > > - There's a pretty large x86_64 update here which naughty maintainer wants > in 2.6.13. Extra testing, please.
There are two problems with the compilation of arch/x86_64/kernel/nmi.c. The following patch fixes them. Greets, Rafael Signed-off-by: Rafael J. Wysocki <[EMAIL PROTECTED]> --- linux-2.6.13-rc3-mm3/arch/x86_64/kernel/nmi.c 2005-07-28 21:05:53.000000000 +0200 +++ patched/arch/x86_64/kernel/nmi.c 2005-07-28 18:58:02.000000000 +0200 @@ -152,8 +152,10 @@ int __init check_nmi_watchdog (void) printk(KERN_INFO "testing NMI watchdog ... "); +#ifdef CONFIG_SMP if (nmi_watchdog == NMI_LOCAL_APIC) smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0); +#endif for (cpu = 0; cpu < NR_CPUS; cpu++) counts[cpu] = cpu_pda[cpu].__nmi_count; @@ -290,7 +292,7 @@ void enable_timer_nmi_watchdog(void) static int nmi_pm_active; /* nmi_active before suspend */ -static int lapic_nmi_suspend(struct sys_device *dev, u32 state) +static int lapic_nmi_suspend(struct sys_device *dev, pm_message_t state) { nmi_pm_active = nmi_active; disable_lapic_nmi_watchdog(); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/