Messages in this thread Patch in this message | | | Date | Wed, 06 Sep 2006 00:09:41 +0200 | From | Cedric Le Goater <> | Subject | Re: [PATCH 11/13] BC: vmrss (preparations) |
| |
Kirill Korotaev wrote:
<snip>
> --- ./include/bc/beancounter.h.bcvmrssprep 2006-09-05 > 13:17:50.000000000 +0400 > +++ ./include/bc/beancounter.h 2006-09-05 13:44:33.000000000 +0400 > @@ -45,6 +45,13 @@ struct bc_resource_parm { > #define BC_MAXVALUE LONG_MAX > > /* > + * This magic is used to distinuish user beancounter and pages beancounter > + * in struct page. page_ub and page_bc are placed in union and MAGIC > + * ensures us that we don't use pbc as ubc in bc_page_uncharge(). > + */ > +#define BC_MAGIC 0x62756275UL > + > +/* > * Resource management structures > * Serialization issues: > * beancounter list management is protected via bc_hash_lock > @@ -54,11 +61,13 @@ struct bc_resource_parm { > */ > > struct beancounter { > + unsigned long bc_magic; > atomic_t bc_refcount; > spinlock_t bc_lock; > bcid_t bc_id; > struct hlist_node hash; > > + unsigned long unused_privvmpages; > /* resources statistics and settings */ > struct bc_resource_parm bc_parms[BC_RESOURCES]; > }; > @@ -74,6 +83,8 @@ enum bc_severity { BC_BARRIER, BC_LIMIT, > > #ifdef CONFIG_BEANCOUNTERS > > +extern unsigned int nr_beancounters = 1; > +
my gcc doesn't like this one ...
regards,
C.
Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
--- include/bc/beancounter.h | 2 +- kernel/bc/beancounter.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Index: 2.6.18-rc5-mm1/include/bc/beancounter.h =================================================================== --- 2.6.18-rc5-mm1.orig/include/bc/beancounter.h +++ 2.6.18-rc5-mm1/include/bc/beancounter.h @@ -86,7 +86,7 @@ enum bc_severity { BC_BARRIER, BC_LIMIT,
#ifdef CONFIG_BEANCOUNTERS
-extern unsigned int nr_beancounters = 1; +extern unsigned int nr_beancounters;
/* * These functions tune minheld and maxheld values for a given Index: 2.6.18-rc5-mm1/kernel/bc/beancounter.c =================================================================== --- 2.6.18-rc5-mm1.orig/kernel/bc/beancounter.c +++ 2.6.18-rc5-mm1/kernel/bc/beancounter.c @@ -20,7 +20,7 @@ static void init_beancounter_struct(stru
struct beancounter init_bc;
-unsigned int nr_beancounters; +unsigned int nr_beancounters = 1;
const char *bc_rnames[] = { "kmemsize", /* 0 */ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |