Commit b286e218 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.30-rc6' into x86/mm 



Merge reason: sync up to -rc6 which has changes to mm/ which we are
              going to touch in the commits to follow as well.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents ed077b58 1406de8e

Documentation/DocBook/kgdb.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ 
    seriously wrong while debugging, it will most often be the case

    that you want to enable gdb to be verbose about its target

    communications.  You do this prior to issuing the <constant>target

    remote</constant> command by typing in: <constant>set remote debug 1</constant>

    remote</constant> command by typing in: <constant>set debug remote 1</constant>

    </para>

  </chapter>

  <chapter id="KGDBTestSuite">

Documentation/sysctl/vm.txt

+0 −28
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ Currently, these files are in /proc/sys/vm: 
- nr_hugepages

- nr_overcommit_hugepages

- nr_pdflush_threads

- nr_pdflush_threads_min

- nr_pdflush_threads_max

- nr_trim_pages         (only if CONFIG_MMU=n)

- numa_zonelist_order

- oom_dump_tasks
@@ -469,32 +467,6 @@ The default value is 0. 


==============================================================



nr_pdflush_threads_min



This value controls the minimum number of pdflush threads.



At boot time, the kernel will create and maintain 'nr_pdflush_threads_min'

threads for the kernel's lifetime.



The default value is 2.  The minimum value you can specify is 1, and

the maximum value is the current setting of 'nr_pdflush_threads_max'.



See 'nr_pdflush_threads_max' below for more information.



==============================================================



nr_pdflush_threads_max



This value controls the maximum number of pdflush threads that can be

created.  The pdflush algorithm will create a new pdflush thread (up to

this maximum) if no pdflush threads have been available for >= 1 second.



The default value is 8.  The minimum value you can specify is the

current value of 'nr_pdflush_threads_min' and the

maximum is 1000.



==============================================================



overcommit_memory:



This value contains a flag that enables memory overcommitment.

Documentation/sysfs-rules.txt

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ versions of the sysfs interface. 
  "devices" directory at /sys/subsystem/<name>/devices.



  If /sys/subsystem exists, /sys/bus, /sys/class and /sys/block can be

  ignored. If it does not exist, you have always to scan all three

  ignored. If it does not exist, you always have to scan all three

  places, as the kernel is free to move a subsystem from one place to

  the other, as long as the devices are still reachable by the same

  subsystem name.

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 30

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Vindictive Armadillo



# *DOCUMENTATION*

arch/alpha/include/asm/percpu.h

+25 −1
Original line number Diff line number Diff line 
#ifndef __ALPHA_PERCPU_H

#define __ALPHA_PERCPU_H



#include <linux/compiler.h>

#include <linux/threads.h>

#include <linux/percpu-defs.h>



/*

 * Determine the real variable name from the name visible in the
@@ -73,6 +75,28 @@ extern unsigned long __per_cpu_offset[NR_CPUS]; 


#endif /* SMP */



#include <asm-generic/percpu.h>

#ifdef CONFIG_SMP

#define PER_CPU_BASE_SECTION ".data.percpu"

#else

#define PER_CPU_BASE_SECTION ".data"

#endif



#ifdef CONFIG_SMP



#ifdef MODULE

#define PER_CPU_SHARED_ALIGNED_SECTION ""

#else

#define PER_CPU_SHARED_ALIGNED_SECTION ".shared_aligned"

#endif

#define PER_CPU_FIRST_SECTION ".first"



#else



#define PER_CPU_SHARED_ALIGNED_SECTION ""

#define PER_CPU_FIRST_SECTION ""



#endif



#define PER_CPU_ATTRIBUTES



#endif /* __ALPHA_PERCPU_H */