Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6538499 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block 

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Revert "mm: add /proc controls for pdflush threads"
  viocd: needs to depend on BLOCK
  block: fix the bio_vec array index out-of-bounds test
parents 662f11cf cd17cbfd

Documentation/sysctl/vm.txt

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

- nr_hugepages

- nr_overcommit_hugepages

- nr_overcommit_hugepages

- nr_pdflush_threads

- nr_pdflush_threads

- nr_pdflush_threads_min

- nr_pdflush_threads_max

- nr_trim_pages         (only if CONFIG_MMU=n)

- nr_trim_pages         (only if CONFIG_MMU=n)

- numa_zonelist_order

- numa_zonelist_order

- oom_dump_tasks

- 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:

overcommit_memory:





This value contains a flag that enables memory overcommitment.

This value contains a flag that enables memory overcommitment.

arch/powerpc/platforms/iseries/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ config VIODASD 




config VIOCD

config VIOCD

	tristate "iSeries Virtual I/O CD support"

	tristate "iSeries Virtual I/O CD support"

	depends on BLOCK

	select VIOPATH

	select VIOPATH

	help

	help

	  If you are running Linux on an IBM iSeries system and you want to

	  If you are running Linux on an IBM iSeries system and you want to

block/blk-core.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1768,10 +1768,10 @@ static int __end_that_request_first(struct request *req, int error, 
		} else {

		} else {

			int idx = bio->bi_idx + next_idx;

			int idx = bio->bi_idx + next_idx;





			if (unlikely(bio->bi_idx >= bio->bi_vcnt)) {

			if (unlikely(idx >= bio->bi_vcnt)) {

				blk_dump_rq_flags(req, "__end_that");

				blk_dump_rq_flags(req, "__end_that");

				printk(KERN_ERR "%s: bio idx %d >= vcnt %d\n",

				printk(KERN_ERR "%s: bio idx %d >= vcnt %d\n",

				       __func__, bio->bi_idx, bio->bi_vcnt);

				       __func__, idx, bio->bi_vcnt);

				break;

				break;

			}

			}

include/linux/writeback.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -168,8 +168,6 @@ void writeback_set_ratelimit(void); 
/* pdflush.c */

/* pdflush.c */

extern int nr_pdflush_threads;	/* Global so it can be exported to sysctl

extern int nr_pdflush_threads;	/* Global so it can be exported to sysctl

				   read-only. */

				   read-only. */

extern int nr_pdflush_threads_max; /* Global so it can be exported to sysctl */

extern int nr_pdflush_threads_min; /* Global so it can be exported to sysctl */









#endif		/* WRITEBACK_H */
 
#endif		/* WRITEBACK_H */

kernel/sysctl.c

+0 −23
Original line number Original line Diff line number Diff line
@@ -101,7 +101,6 @@ static int __maybe_unused one = 1; 
static int __maybe_unused two = 2;

static int __maybe_unused two = 2;

static unsigned long one_ul = 1;

static unsigned long one_ul = 1;

static int one_hundred = 100;

static int one_hundred = 100;

static int one_thousand = 1000;





/* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */

/* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */

static unsigned long dirty_bytes_min = 2 * PAGE_SIZE;

static unsigned long dirty_bytes_min = 2 * PAGE_SIZE;
@@ -1033,28 +1032,6 @@ static struct ctl_table vm_table[] = { 
		.mode		= 0444 /* read-only*/,

		.mode		= 0444 /* read-only*/,

		.proc_handler	= &proc_dointvec,

		.proc_handler	= &proc_dointvec,

	},

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "nr_pdflush_threads_min",

		.data		= &nr_pdflush_threads_min,

		.maxlen		= sizeof nr_pdflush_threads_min,

		.mode		= 0644 /* read-write */,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.extra1		= &one,

		.extra2		= &nr_pdflush_threads_max,

	},

	{

		.ctl_name	= CTL_UNNUMBERED,

		.procname	= "nr_pdflush_threads_max",

		.data		= &nr_pdflush_threads_max,

		.maxlen		= sizeof nr_pdflush_threads_max,

		.mode		= 0644 /* read-write */,

		.proc_handler	= &proc_dointvec_minmax,

		.strategy	= &sysctl_intvec,

		.extra1		= &nr_pdflush_threads_min,

		.extra2		= &one_thousand,

	},

	{

	{

		.ctl_name	= VM_SWAPPINESS,

		.ctl_name	= VM_SWAPPINESS,

		.procname	= "swappiness",

		.procname	= "swappiness",