2 files changed, 18 insertions, 14 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 1a979ea3b379..7fb37d6f2864 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1810,17 +1810,21 @@ static int proc_base_fill_cache(struct file *filp, void *dirent, filldir_t filld
 static int proc_pid_io_accounting(struct task_struct *task, char *buffer)
 {
         return sprintf(buffer,
+#ifdef CONFIG_TASK_XACCT
                         "rchar: %llu\n"
                         "wchar: %llu\n"
                         "syscr: %llu\n"
                         "syscw: %llu\n"
+#endif
                         "read_bytes: %llu\n"
                         "write_bytes: %llu\n"
                         "cancelled_write_bytes: %llu\n",
+#ifdef CONFIG_TASK_XACCT
                         (unsigned long long)task->rchar,
                         (unsigned long long)task->wchar,
                         (unsigned long long)task->syscr,
                         (unsigned long long)task->syscw,
+#endif
                         (unsigned long long)task->ioac.read_bytes,
                         (unsigned long long)task->ioac.write_bytes,
                         (unsigned long long)task->ioac.cancelled_write_bytes);
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index b37ce33f67ea..5e2d4359c292 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -121,16 +121,11 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
 {
         struct sysinfo i;
         int len;
-        unsigned long inactive;
-        unsigned long active;
-        unsigned long free;
         unsigned long committed;
         unsigned long allowed;
         struct vmalloc_info vmi;
         long cached;
 
-        get_zone_counts(&active, &inactive, &free);
-
 /*
  * display in kilobytes.
  */
@@ -187,8 +182,8 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
                 K(i.bufferram),
                 K(cached),
                 K(total_swapcache_pages),
-                K(active),
-                K(inactive),
+                K(global_page_state(NR_ACTIVE)),
+                K(global_page_state(NR_INACTIVE)),
 #ifdef CONFIG_HIGHMEM
                 K(i.totalhigh),
                 K(i.freehigh),
@@ -672,7 +667,6 @@ void create_seq_entry(char *name, mode_t mode, const struct file_operations *f)
 
 void __init proc_misc_init(void)
 {
-        struct proc_dir_entry *entry;
         static struct {
                 char *name;
                 int (*read_proc)(char*,char**,off_t,int,int*,void*);
@@ -700,9 +694,12 @@ void __init proc_misc_init(void)
 
         /* And now for trickier ones */
 #ifdef CONFIG_PRINTK
-        entry = create_proc_entry("kmsg", S_IRUSR, &proc_root);
-        if (entry)
-                entry->proc_fops = &proc_kmsg_operations;
+        {
+                struct proc_dir_entry *entry;
+                entry = create_proc_entry("kmsg", S_IRUSR, &proc_root);
+                if (entry)
+                        entry->proc_fops = &proc_kmsg_operations;
+        }
 #endif
         create_seq_entry("devices", 0, &proc_devinfo_operations);
         create_seq_entry("cpuinfo", 0, &proc_cpuinfo_operations);
@@ -743,8 +740,11 @@ void __init proc_misc_init(void)
                 proc_vmcore->proc_fops = &proc_vmcore_operations;
 #endif
 #ifdef CONFIG_MAGIC_SYSRQ
-        entry = create_proc_entry("sysrq-trigger", S_IWUSR, NULL);
-        if (entry)
-                entry->proc_fops = &proc_sysrq_trigger_operations;
+        {
+                struct proc_dir_entry *entry;
+                entry = create_proc_entry("sysrq-trigger", S_IWUSR, NULL);
+                if (entry)
+                        entry->proc_fops = &proc_sysrq_trigger_operations;
+        }
 #endif
 }