11 files changed, 74 insertions, 34 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index cdef6cea8900..b65187f0c74e 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -208,8 +208,10 @@ static inline int dup_mmap(struct mm_struct * mm, struct mm_struct * oldmm)
                 struct file *file;
 
                 if (mpnt->vm_flags & VM_DONTCOPY) {
+                        long pages = vma_pages(mpnt);
+                        mm->total_vm -= pages;
                         __vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
-                                                        -vma_pages(mpnt));
+                                                                -pages);
                         continue;
                 }
                 charge = 0;
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 90c0e82b650c..b0237122b24e 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -574,7 +574,7 @@ static int __init init_kprobes(void)
                 INIT_HLIST_HEAD(&kretprobe_inst_table[i]);
         }
 
-        err = arch_init();
+        err = arch_init_kprobes();
         if (!err)
                 err = register_die_notifier(&kprobe_exceptions_nb);
 
diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index fb8de63c2919..3ec789c6b537 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -16,6 +16,8 @@
 #include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/fs.h>
+#include <linux/mount.h>
+
 #include "power.h"
 
 
@@ -234,6 +236,16 @@ static int software_resume(void)
 {
         int error;
 
+        if (!swsusp_resume_device) {
+                if (!strlen(resume_file))
+                        return -ENOENT;
+                swsusp_resume_device = name_to_dev_t(resume_file);
+                pr_debug("swsusp: Resume From Partition %s\n", resume_file);
+        } else {
+                pr_debug("swsusp: Resume From Partition %d:%d\n",
+                         MAJOR(swsusp_resume_device), MINOR(swsusp_resume_device));
+        }
+
         if (noresume) {
                 /**
                  * FIXME: If noresume is specified, we need to find the partition
diff --git a/kernel/power/main.c b/kernel/power/main.c
index c94cb9e95090..71aa0fd22007 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -19,6 +19,9 @@
 
 #include "power.h"
 
+/*This is just an arbitrary number */
+#define FREE_PAGE_NUMBER (100)
+
 DECLARE_MUTEX(pm_sem);
 
 struct pm_ops * pm_ops = NULL;
@@ -49,6 +52,7 @@ void pm_set_ops(struct pm_ops * ops)
 static int suspend_prepare(suspend_state_t state)
 {
         int error = 0;
+        unsigned int free_pages;
 
         if (!pm_ops || !pm_ops->enter)
                 return -EPERM;
@@ -67,6 +71,16 @@ static int suspend_prepare(suspend_state_t state)
                 goto Thaw;
         }
 
+        if ((free_pages = nr_free_pages()) < FREE_PAGE_NUMBER) {
+                pr_debug("PM: free some memory\n");
+                shrink_all_memory(FREE_PAGE_NUMBER - free_pages);
+                if (nr_free_pages() < FREE_PAGE_NUMBER) {
+                        error = -ENOMEM;
+                        printk(KERN_ERR "PM: No enough memory\n");
+                        goto Thaw;
+                }
+        }
+
         if (pm_ops->prepare) {
                 if ((error = pm_ops->prepare(state)))
                         goto Thaw;
@@ -194,7 +208,7 @@ int software_suspend(void)
 
 int pm_suspend(suspend_state_t state)
 {
-        if (state > PM_SUSPEND_ON && state < PM_SUSPEND_MAX)
+        if (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX)
                 return enter_state(state);
         return -EINVAL;
 }
diff --git a/kernel/power/process.c b/kernel/power/process.c
index 0a086640bcfc..3bd0d261818f 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -59,6 +59,7 @@ int freeze_processes(void)
         int todo;
         unsigned long start_time;
         struct task_struct *g, *p;
+        unsigned long flags;
 
         printk( "Stopping tasks: " );
         start_time = jiffies;
@@ -66,12 +67,9 @@ int freeze_processes(void)
                 todo = 0;
                 read_lock(&tasklist_lock);
                 do_each_thread(g, p) {
-                        unsigned long flags;
                         if (!freezeable(p))
                                 continue;
-                        if ((frozen(p)) ||
-                            (p->state == TASK_TRACED) ||
-                            (p->state == TASK_STOPPED))
+                        if (frozen(p))
                                 continue;
 
                         freeze(p);
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index c285fc5a2320..f2bc71b9fe8b 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -63,6 +63,7 @@
 #include <linux/console.h>
 #include <linux/highmem.h>
 #include <linux/bio.h>
+#include <linux/mount.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
@@ -869,13 +870,6 @@ extern asmlinkage int swsusp_arch_resume(void);
 
 asmlinkage int swsusp_save(void)
 {
-        int error = 0;
-
-        if ((error = swsusp_swap_check())) {
-                printk(KERN_ERR "swsusp: FATAL: cannot find swap device, try "
-                                "swapon -a!\n");
-                return error;
-        }
         return suspend_prepare_image();
 }
 
@@ -892,14 +886,20 @@ int swsusp_suspend(void)
          * at resume time, and evil weirdness ensues.
          */
         if ((error = device_power_down(PMSG_FREEZE))) {
-                printk(KERN_ERR "Some devices failed to power down, aborting suspend\n");
                 local_irq_enable();
-                swsusp_free();
                 return error;
         }
+
+        if ((error = swsusp_swap_check())) {
+                printk(KERN_ERR "swsusp: FATAL: cannot find swap device, try "
+                                "swapon -a!\n");
+                local_irq_enable();
+                return error;
+        }
+
         save_processor_state();
         if ((error = swsusp_arch_suspend()))
-                swsusp_free();
+                printk("Error %d suspending\n", error);
         /* Restore control flow magically appears here */
         restore_processor_state();
         BUG_ON (nr_copy_pages_check != nr_copy_pages);
@@ -1166,9 +1166,9 @@ static int bio_write_page(pgoff_t page_off, void * page)
 static const char * sanity_check(void)
 {
         dump_info();
-        if(swsusp_info.version_code != LINUX_VERSION_CODE)
+        if (swsusp_info.version_code != LINUX_VERSION_CODE)
                 return "kernel version";
-        if(swsusp_info.num_physpages != num_physpages)
+        if (swsusp_info.num_physpages != num_physpages)
                 return "memory size";
         if (strcmp(swsusp_info.uts.sysname,system_utsname.sysname))
                 return "system type";
@@ -1261,8 +1261,6 @@ static int data_read(struct pbe *pblist)
         return error;
 }
 
-extern dev_t name_to_dev_t(const char *line);
-
 /**
  *      read_pagedir - Read page backup list pages from swap
  */
@@ -1356,16 +1354,6 @@ int swsusp_check(void)
 {
         int error;
 
-        if (!swsusp_resume_device) {
-                if (!strlen(resume_file))
-                        return -ENOENT;
-                swsusp_resume_device = name_to_dev_t(resume_file);
-                pr_debug("swsusp: Resume From Partition %s\n", resume_file);
-        } else {
-                pr_debug("swsusp: Resume From Partition %d:%d\n",
-                         MAJOR(swsusp_resume_device), MINOR(swsusp_resume_device));
-        }
-
         resume_bdev = open_by_devnum(swsusp_resume_device, FMODE_READ);
         if (!IS_ERR(resume_bdev)) {
                 set_blocksize(resume_bdev, PAGE_SIZE);
diff --git a/kernel/profile.c b/kernel/profile.c
index ad8cbb75ffa2..f89248e6d704 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -35,11 +35,11 @@ struct profile_hit {
 #define NR_PROFILE_GRP          (NR_PROFILE_HIT/PROFILE_GRPSZ)
 
 /* Oprofile timer tick hook */
-int (*timer_hook)(struct pt_regs *);
+int (*timer_hook)(struct pt_regs *) __read_mostly;
 
 static atomic_t *prof_buffer;
 static unsigned long prof_len, prof_shift;
-static int prof_on;
+static int prof_on __read_mostly;
 static cpumask_t prof_cpu_mask = CPU_MASK_ALL;
 #ifdef CONFIG_SMP
 static DEFINE_PER_CPU(struct profile_hit *[2], cpu_profile_hits);
diff --git a/kernel/sched.c b/kernel/sched.c
index 5f2182d42241..4107db0dc091 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3877,6 +3877,13 @@ asmlinkage long sys_sched_yield(void)
 
 static inline void __cond_resched(void)
 {
+        /*
+         * The BKS might be reacquired before we have dropped
+         * PREEMPT_ACTIVE, which could trigger a second
+         * cond_resched() call.
+         */
+        if (unlikely(preempt_count()))
+                return;
         do {
                 add_preempt_count(PREEMPT_ACTIVE);
                 schedule();
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
index 29196ce9b40f..42b40ae5eada 100644
--- a/kernel/sys_ni.c
+++ b/kernel/sys_ni.c
@@ -80,6 +80,9 @@ cond_syscall(sys_keyctl);
 cond_syscall(compat_sys_keyctl);
 cond_syscall(compat_sys_socketcall);
 cond_syscall(sys_set_zone_reclaim);
+cond_syscall(sys_inotify_init);
+cond_syscall(sys_inotify_add_watch);
+cond_syscall(sys_inotify_rm_watch);
 
 /* arch-specific weak syscall entries */
 cond_syscall(sys_pciconfig_read);
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 270ee7fadbd8..e60b9c36f1f0 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -146,6 +146,9 @@ extern ctl_table random_table[];
 #ifdef CONFIG_UNIX98_PTYS
 extern ctl_table pty_table[];
 #endif
+#ifdef CONFIG_INOTIFY
+extern ctl_table inotify_table[];
+#endif
 
 #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT
 int sysctl_legacy_va_layout;
@@ -218,6 +221,7 @@ static ctl_table root_table[] = {
                 .mode           = 0555,
                 .child          = dev_table,
         },
+
         { .ctl_name = 0 }
 };
 
@@ -950,6 +954,14 @@ static ctl_table fs_table[] = {
                 .mode           = 0644,
                 .proc_handler   = &proc_dointvec,
         },
+#ifdef CONFIG_INOTIFY
+        {
+                .ctl_name       = FS_INOTIFY,
+                .procname       = "inotify",
+                .mode           = 0555,
+                .child          = inotify_table,
+        },
+#endif  
 #endif
         {
                 .ctl_name       = KERN_SETUID_DUMPABLE,
@@ -968,7 +980,7 @@ static ctl_table debug_table[] = {
 
 static ctl_table dev_table[] = {
         { .ctl_name = 0 }
-};  
+};
 
 extern void init_irq_proc (void);
 
diff --git a/kernel/user.c b/kernel/user.c
index 734575d55769..89e562feb1b1 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -120,6 +120,10 @@ struct user_struct * alloc_uid(uid_t uid)
                 atomic_set(&new->processes, 0);
                 atomic_set(&new->files, 0);
                 atomic_set(&new->sigpending, 0);
+#ifdef CONFIG_INOTIFY
+                atomic_set(&new->inotify_watches, 0);
+                atomic_set(&new->inotify_devs, 0);
+#endif
 
                 new->mq_bytes = 0;
                 new->locked_shm = 0;