Skip to contentSkip to conversation

2.6.19-4c6-rt9 build problem

PATCH In review Paul E. McKenney 2 participants 5 messages Nov 29, 2006 – Nov 30, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 2.6.19-4c6-rt9 build problem

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.

---

 acpi_pmtmr.h |    2 ++
 1 files changed, 2 insertions(+)
include/linux/acpi_pmtmr.h +2 -0
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
@@ -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;
#1 lore raw
Quoted 5 lines · Paul E. McKenney

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?

Ingo

#2 lore raw
Quoted 10 lines · Ingo Molnar
Quoted 5 lines · Paul E. McKenney

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...

 include/linux/acpi_pmtmr.h |    2 ++
 mm/page_alloc.c            |    2 ++
 2 files changed, 4 insertions(+)
include/linux/acpi_pmtmr.h +2 -0
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
@@ -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;
mm/page_alloc.c +2 -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
@@ -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);
#3 lore raw
Quoted 11 lines · Paul E. McKenney
Quoted 10 lines · Ingo Molnar
Quoted 5 lines · Paul E. McKenney

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?

And with these two changes, it does boot!

Thanx, Paul

Quoted 36 lines

Hit another build error. :-/

The following combined (crude) patch makes the build succeed. Rebooting now, with fingers firmly crossed...

 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

include/linux/acpi_pmtmr.h +2 -0
@@ -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

mm/page_alloc.c +2 -0
@@ -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);
#4 lore raw
Quoted 4 lines · Paul E. McKenney
Quoted 2 lines
Quoted 2 lines

thanks, applied. Have you tried to boot the resulting kernel as well?

And with these two changes, it does boot!

great! Applied both of them.

Ingo