diff --git a/[refs] b/[refs] index 461baa928395..2c12f40e3c4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b76e20b27d20f7cb240e6b1b2dbebaa1b7f9b60 +refs/heads/master: 2aea4fb61609ba7ef82f7dc6fca116bda88816e1 diff --git a/trunk/include/linux/vmstat.h b/trunk/include/linux/vmstat.h index c89df55f6e03..532360010919 100644 --- a/trunk/include/linux/vmstat.h +++ b/trunk/include/linux/vmstat.h @@ -10,8 +10,9 @@ /* * Light weight per cpu counter implementation. * - * Counters should only be incremented and no critical kernel component - * should rely on the counter values. + * Counters should only be incremented. You need to set EMBEDDED + * to disable VM_EVENT_COUNTERS. Things like procps (vmstat, + * top, etc) use /proc/vmstat and depend on these counters. * * Counters are handled completely inline. On many platforms the code * generated will simply be the increment of a global address. diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index f000edb3bb7a..9b1adb176ea8 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -461,10 +461,10 @@ config VM_EVENT_COUNTERS default y bool "Enable VM event counters for /proc/vmstat" if EMBEDDED help - VM event counters are only needed to for event counts to be - shown. They have no function for the kernel itself. This - option allows the disabling of the VM event counters. - /proc/vmstat will only show page counts. + VM event counters are needed for event counts to be shown. + This option allows the disabling of the VM event counters + on EMBEDDED systems. /proc/vmstat will only show page counts + if VM event counters are disabled. endmenu # General setup