On Wed, Nov 29, 2006 at 09:03:07PM +0100, Ingo Molnar wrote:
>
> * Paul E. McKenney <[EMAIL PROTECTED]> wrote:
>
> > Hello!
> >
> > Got a compiler error building 1.6.19-rc6-rt9 on NUMA-Q, admittedly
> > with unusual config. The patch below solves it, though I cannot say
> > that I am an ACPI expert.
>
> thanks, applied. Have you tried to boot the resulting kernel as well?
Hit another build error. :-/
The following combined (crude) patch makes the build succeed. Rebooting now,
with fingers firmly crossed...
Signed-off-by: Paul E. McKenney <[EMAIL PROTECTED]>
include/linux/acpi_pmtmr.h | 2 ++
mm/page_alloc.c | 2 ++
2 files changed, 4 insertions(+)
diff -urpNa -X dontdiff linux-2.6.19-rc6-rt9/include/linux/acpi_pmtmr.h
linux-2.6.19-rc6-rt9.tscbug/include/linux/acpi_pmtmr.h
--- linux-2.6.19-rc6-rt9/include/linux/acpi_pmtmr.h 2006-11-28
17:21:55.000000000 -0800
+++ linux-2.6.19-rc6-rt9.tscbug/include/linux/acpi_pmtmr.h 2006-11-29
08:09:07.000000000 -0800
@@ -27,6 +27,8 @@ static inline u32 acpi_pm_read_early(voi
#else
+#define pmtmr_ioport 0
+
static inline u32 acpi_pm_read_early(void)
{
return 0;
diff -urpNa -X dontdiff linux-2.6.19-rc6-rt9/mm/page_alloc.c
linux-2.6.19-rc6-rt9.tscbug/mm/page_alloc.c
--- linux-2.6.19-rc6-rt9/mm/page_alloc.c 2006-11-28 17:21:56.000000000
-0800
+++ linux-2.6.19-rc6-rt9.tscbug/mm/page_alloc.c 2006-11-29 14:14:09.000000000
-0800
@@ -2790,7 +2790,9 @@ static int page_alloc_cpu_notify(struct
__lock_cpu_pcp(&flags, cpu);
WARN_ON_ONCE(cpu == raw_smp_processor_id());
+#ifdef CONFIG_PM
__drain_pages(cpu);
+#endif /* #ifdef CONFIG_PM */
vm_events_fold_cpu(cpu);
refresh_cpu_vm_stats(cpu);
unlock_cpu_pcp(flags, cpu);
-
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/
