Update to 3.0-rc4
authorMichal Marek <mmarek@suse.cz>
Tue, 21 Jun 2011 10:14:44 +0000 (12:14 +0200)
committerMichal Marek <mmarek@suse.cz>
Tue, 21 Jun 2011 11:40:20 +0000 (13:40 +0200)
suse-commit: 1b6bf5d5b20f26bb69d5696aa43d704f0dc4b6f7

1  2 
Makefile
drivers/gpu/drm/nouveau/nouveau_acpi.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
fs/namei.c
include/linux/fs.h
include/linux/kernel.h
init/Kconfig
init/main.c
mm/thrash.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
diff --cc fs/namei.c
Simple merge
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc init/main.c
Simple merge
diff --cc mm/thrash.c
@@@ -29,12 -54,10 +54,13 @@@ static struct mem_cgroup *swap_token_me
  void grab_swap_token(struct mm_struct *mm)
  {
        int current_interval;
 -      unsigned int old_prio = mm->token_priority;
++      unsigned int old_prio;
  
        global_faults++;
 +      if (mm == NULL)
 +              return;
  
++      old_prio = mm->token_priority;
        current_interval = global_faults - mm->faultstamp;
  
        if (!spin_trylock(&swap_token_lock))