Re: mmotm 2009-06-25-15-49 uploaded

[Johannes Weiner <hannes@cmpxchg.org>]

On Thu, Jun 25, 2009 at 04:50:49PM -0700, Randy Dunlap wrote:
> akpm@linux-foundation.org wrote:
> > The mm-of-the-moment snapshot 2009-06-25-15-49 has been uploaded to
> > 
> >    http://userweb.kernel.org/~akpm/mmotm/
> > 
> > and will soon be available at
> > 
> >    git://git.zen-sources.org/zen/mmotm.git
> 
> 
> shrink_slab-handle-bad-shrinkers.patch:
> 
> mm/vmscan.c: In function 'do_try_to_free_pages':
> mm/vmscan.c:1697: error: too few arguments to function 'disable_swap_token'
> mm/vmscan.c: In function 'balance_pgdat':
> mm/vmscan.c:1869: error: too few arguments to function 'disable_swap_token'
> mm/vmscan.c: In function '__zone_reclaim':
> mm/vmscan.c:2425: error: too few arguments to function 'disable_swap_token'

Sorry, my fault - `make CONFIG_SWAP=n` didn't work as I assumed.  The
patch Randy pointed out seems unrelated to this, though...?

---
From: Johannes Weiner <hannes@cmpxchg.org>
Subject: mm: make swap token dummies static inlines fix

disable_swap_token() doesn't take an argument.  This fixes the
!CONFIG_SWAP dummy.

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
---

diff --git a/include/linux/swap.h b/include/linux/swap.h
index 9b02f33..6c990e6 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -432,7 +432,7 @@ static inline int has_swap_token(struct mm_struct *mm)
 	return 0;
 }
 
-static inline void disable_swap_token(struct mm_struct *mm)
+static inline void disable_swap_token(void)
 {
 }