Merge branch ‘fixes’ of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300 [Linux 2.6.38]

This Linux kernel change "Merge branch ‘fixes’ of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300" is included in the Linux 2.6.38 release. This change is authored by Linus Torvalds <torvalds [at] linux-foundation.org> on Mon Mar 14 15:20:39 2011 -0700. The commit for this change in Linux stable tree is 59766ed (patch). Other info about this change: Merge: 2990821 af79420

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
  MN10300: atomic_read() should ensure it emits a load
  MN10300: The SMP_ICACHE_INV_FLUSH_RANGE IPI command does not exist
  MN10300: Proper use of macros get_user() in the case of incremented pointers

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 mm/oom_kill.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index b19c78e..7dcca55 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -458,10 +458,10 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
                struct mem_cgroup *mem, nodemask_t *nodemask,
                const char *message)
 {
-   struct task_struct *victim;
+   struct task_struct *victim = p;
    struct task_struct *child;
-   struct task_struct *t;
-   unsigned int victim_points;
+   struct task_struct *t = p;
+   unsigned int victim_points = 0;

    if (printk_ratelimit())
        dump_header(p, gfp_mask, order, mem, nodemask);
@@ -487,15 +487,10 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
     * parent.  This attempts to lose the minimal amount of work done while
     * still freeing memory.
     */
-   victim_points = oom_badness(p, mem, nodemask, totalpages);
-   victim = p;
-   t = p;
    do {
        list_for_each_entry(child, &t->children, sibling) {
            unsigned int child_points;

-           if (child->mm == t->mm)
-               continue;
            /*
             * oom_badness() returns 0 if the thread is unkillable
             */

Leave a Reply

Your email address will not be published. Required fields are marked *