[PATCH 1/3] vmevent: Fix build for SWAP=n case

[PATCH 1/3] vmevent: Fix build for SWAP=n case

[Anton Vorontsov]

Caught this build failure:

  CC      mm/vmevent.o
mm/vmevent.c:17:6: error: expected identifier or '(' before numeric constant
mm/vmevent.c:18:1: warning: no semicolon at end of struct or union [enabled by default]
mm/vmevent.c: In function 'vmevent_sample':
mm/vmevent.c:84:36: error: expected identifier before numeric constant
make[1]: *** [mm/vmevent.o] Error 1
make: *** [mm/] Error 2

This is because linux/swap.h defines nr_swap_pages to 0L, and so things
break.

Fix this by undefinding it back, as we don't use it anyway.

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
---

The patch is for git://github.com/penberg/linux.git vmevent/core.

 mm/vmevent.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/mm/vmevent.c b/mm/vmevent.c
index 37d2c5f..2342752 100644
--- a/mm/vmevent.c
+++ b/mm/vmevent.c
@@ -6,6 +6,7 @@
 #include <linux/poll.h>
 #include <linux/slab.h>
 #include <linux/swap.h>
+#undef nr_swap_pages /* This is defined to a constant for SWAP=n case */
 
 #define VMEVENT_MAX_FREE_THRESHOD	100
 
-- 
1.7.7.6

[PATCH 1/3] vmevent: Fix build for SWAP=n case

[Anton Vorontsov]

Caught this build failure:

  CC      mm/vmevent.o
mm/vmevent.c:17:6: error: expected identifier or '(' before numeric constant
mm/vmevent.c:18:1: warning: no semicolon at end of struct or union [enabled by default]
mm/vmevent.c: In function 'vmevent_sample':
mm/vmevent.c:84:36: error: expected identifier before numeric constant
make[1]: *** [mm/vmevent.o] Error 1
make: *** [mm/] Error 2

This is because linux/swap.h defines nr_swap_pages to 0L, and so things
break.

Fix this by undefinding it back, as we don't use it anyway.

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
---

The patch is for git://github.com/penberg/linux.git vmevent/core.

 mm/vmevent.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/mm/vmevent.c b/mm/vmevent.c
index 37d2c5f..2342752 100644
--- a/mm/vmevent.c
+++ b/mm/vmevent.c
@@ -6,6 +6,7 @@
 #include <linux/poll.h>
 #include <linux/slab.h>
 #include <linux/swap.h>
+#undef nr_swap_pages /* This is defined to a constant for SWAP=n case */
 
 #define VMEVENT_MAX_FREE_THRESHOD	100
 
-- 
1.7.7.6

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH 1/3] vmevent: Fix build for SWAP=n case

[Pekka Enberg]

On Sat, 3 Mar 2012, Anton Vorontsov wrote:
> Caught this build failure:
> 
>   CC      mm/vmevent.o
> mm/vmevent.c:17:6: error: expected identifier or '(' before numeric constant
> mm/vmevent.c:18:1: warning: no semicolon at end of struct or union [enabled by default]
> mm/vmevent.c: In function 'vmevent_sample':
> mm/vmevent.c:84:36: error: expected identifier before numeric constant
> make[1]: *** [mm/vmevent.o] Error 1
> make: *** [mm/] Error 2
> 
> This is because linux/swap.h defines nr_swap_pages to 0L, and so things
> break.
> 
> Fix this by undefinding it back, as we don't use it anyway.
> 
> Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>

Applied, thanks!

Re: [PATCH 1/3] vmevent: Fix build for SWAP=n case

[Pekka Enberg]

On Sat, 3 Mar 2012, Anton Vorontsov wrote:
> Caught this build failure:
> 
>   CC      mm/vmevent.o
> mm/vmevent.c:17:6: error: expected identifier or '(' before numeric constant
> mm/vmevent.c:18:1: warning: no semicolon at end of struct or union [enabled by default]
> mm/vmevent.c: In function 'vmevent_sample':
> mm/vmevent.c:84:36: error: expected identifier before numeric constant
> make[1]: *** [mm/vmevent.o] Error 1
> make: *** [mm/] Error 2
> 
> This is because linux/swap.h defines nr_swap_pages to 0L, and so things
> break.
> 
> Fix this by undefinding it back, as we don't use it anyway.
> 
> Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>

Applied, thanks!

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>