2006-12-15 03:40:57

by Magnus Damm

Subject: [PATCH 2.6.20-rc1] fix vm_events_fold_cpu() build breakage

fix vm_events_fold_cpu() build breakage

2.6.20-rc1 does not build properly if CONFIG_VM_EVENT_COUNTERS is set
and CONFIG_HOTPLUG is unset:

CC init/version.o
LD init/built-in.o
LD .tmp_vmlinux1
mm/built-in.o: In function `page_alloc_cpu_notify':
page_alloc.c:(.text+0x56eb): undefined reference to `vm_events_fold_cpu'
make: *** [.tmp_vmlinux1] Error 1

Signed-Off-By: Magnus Damm <[email protected]>
---

Applies on top of linux-2.6.20-rc1.

include/linux/vmstat.h | 4 ++++
1 file changed, 4 insertions(+)

--- 0001/include/linux/vmstat.h
+++ 0003/include/linux/vmstat.h 2006-12-15 11:46:23.000000000 +0900
@@ -73,7 +73,11 @@ static inline void count_vm_events(enum
}

extern void all_vm_events(unsigned long *);
+#ifdef CONFIG_HOTPLUG
extern void vm_events_fold_cpu(int cpu);
+#else
+#define vm_events_fold_cpu(x) do { } while (0)
+#endif

#else

2006-12-16 18:36:23

by Christoph Lameter

Subject: Re: [PATCH 2.6.20-rc1] fix vm_events_fold_cpu() build breakage

On Fri, 15 Dec 2006, Magnus Damm wrote:

> fix vm_events_fold_cpu() build breakage

Acked-by: Christoph Lameter <[email protected]>

2006-12-17 15:11:57

by Jean Delvare

Subject: Re: [PATCH 2.6.20-rc1] fix vm_events_fold_cpu() build breakage

On Sat, 16 Dec 2006 10:35:29 -0800 (PST), Christoph Lameter wrote:
> On Fri, 15 Dec 2006, Magnus Damm wrote:
>
> > fix vm_events_fold_cpu() build breakage
>
> Acked-by: Christoph Lameter <[email protected]>

I've hit that one too. Can this fix be sent upstream quickly please?

Thanks,
--
Jean Delvare