Commit 5af43c24 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (incoming from Andrew) 

Merge more incoming from Andrew Morton:

 - Various fixes which were stalled or which I picked up recently

 - A large rotorooting of the AIO code.  Allegedly to improve
   performance but I don't really have good performance numbers (I might
   have lost the email) and I can't raise Kent today.  I held this out
   of 3.9 and we could give it another cycle if it's all too late/scary.

I ended up taking only the first two thirds of the AIO rotorooting.  I
left the percpu parts and the batch completion for later.  - Linus

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (33 commits)
  aio: don't include aio.h in sched.h
  aio: kill ki_retry
  aio: kill ki_key
  aio: give shared kioctx fields their own cachelines
  aio: kill struct aio_ring_info
  aio: kill batch allocation
  aio: change reqs_active to include unreaped completions
  aio: use cancellation list lazily
  aio: use flush_dcache_page()
  aio: make aio_read_evt() more efficient, convert to hrtimers
  wait: add wait_event_hrtimeout()
  aio: refcounting cleanup
  aio: make aio_put_req() lockless
  aio: do fget() after aio_get_req()
  aio: dprintk() -> pr_debug()
  aio: move private stuff out of aio.h
  aio: add kiocb_cancel()
  aio: kill return value of aio_complete()
  char: add aio_{read,write} to /dev/{null,zero}
  aio: remove retry-based AIO
  ...
parents 9affd6be a27bb332

Documentation/cgroups/memory.txt

+3 −1
Original line number Diff line number Diff line
@@ -480,7 +480,9 @@ memory.stat file includes following statistics 


# per-memory cgroup local status

cache		- # of bytes of page cache memory.

rss		- # of bytes of anonymous and swap cache memory.

rss		- # of bytes of anonymous and swap cache memory (includes

		transparent hugepages).

rss_huge	- # of bytes of anonymous transparent hugepages.

mapped_file	- # of bytes of mapped file (includes tmpfs/shmem)

pgpgin		- # of charging events to the memory cgroup. The charging

		event happens each time a page is accounted as either mapped

arch/s390/hypfs/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/module.h>

#include <linux/seq_file.h>

#include <linux/mount.h>

#include <linux/aio.h>

#include <asm/ebcdic.h>

#include "hypfs.h"

arch/sparc/kernel/leon_smp.c

+3 −12
Original line number Diff line number Diff line
@@ -253,24 +253,15 @@ void __init leon_smp_done(void) 


	/* Free unneeded trap tables */

	if (!cpu_present(1)) {

		ClearPageReserved(virt_to_page(&trapbase_cpu1));

		init_page_count(virt_to_page(&trapbase_cpu1));

		free_page((unsigned long)&trapbase_cpu1);

		totalram_pages++;

		free_reserved_page(virt_to_page(&trapbase_cpu1));

		num_physpages++;

	}

	if (!cpu_present(2)) {

		ClearPageReserved(virt_to_page(&trapbase_cpu2));

		init_page_count(virt_to_page(&trapbase_cpu2));

		free_page((unsigned long)&trapbase_cpu2);

		totalram_pages++;

		free_reserved_page(virt_to_page(&trapbase_cpu2));

		num_physpages++;

	}

	if (!cpu_present(3)) {

		ClearPageReserved(virt_to_page(&trapbase_cpu3));

		init_page_count(virt_to_page(&trapbase_cpu3));

		free_page((unsigned long)&trapbase_cpu3);

		totalram_pages++;

		free_reserved_page(virt_to_page(&trapbase_cpu3));

		num_physpages++;

	}

	/* Ok, they are spinning and ready to go. */

arch/sparc/mm/init_32.c

+3 −34
Original line number Diff line number Diff line
@@ -366,45 +366,14 @@ void __init mem_init(void) 


void free_initmem (void)

{

	unsigned long addr;

	unsigned long freed;



	addr = (unsigned long)(&__init_begin);

	freed = (unsigned long)(&__init_end) - addr;

	for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {

		struct page *p;



		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);

		p = virt_to_page(addr);



		ClearPageReserved(p);

		init_page_count(p);

		__free_page(p);

		totalram_pages++;

		num_physpages++;

	}

	printk(KERN_INFO "Freeing unused kernel memory: %ldk freed\n",

		freed >> 10);

	num_physpages += free_initmem_default(POISON_FREE_INITMEM);

}



#ifdef CONFIG_BLK_DEV_INITRD

void free_initrd_mem(unsigned long start, unsigned long end)

{

	if (start < end)

		printk(KERN_INFO "Freeing initrd memory: %ldk freed\n",

			(end - start) >> 10);

	for (; start < end; start += PAGE_SIZE) {

		struct page *p;



		memset((void *)start, POISON_FREE_INITMEM, PAGE_SIZE);

		p = virt_to_page(start);



		ClearPageReserved(p);

		init_page_count(p);

		__free_page(p);

		totalram_pages++;

		num_physpages++;

	}

	num_physpages += free_reserved_area(start, end, POISON_FREE_INITMEM,

					    "initrd");

}

#endif

arch/sparc/mm/init_64.c

+6 −22
Original line number Diff line number Diff line
@@ -2059,8 +2059,7 @@ void __init mem_init(void) 
	/* We subtract one to account for the mem_map_zero page

	 * allocated below.

	 */

	totalram_pages -= 1;

	num_physpages = totalram_pages;

	num_physpages = totalram_pages - 1;



	/*

	 * Set up the zero page, mark it reserved, so that page count
@@ -2071,7 +2070,7 @@ void __init mem_init(void) 
		prom_printf("paging_init: Cannot alloc zero page.\n");

		prom_halt();

	}

	SetPageReserved(mem_map_zero);

	mark_page_reserved(mem_map_zero);



	codepages = (((unsigned long) _etext) - ((unsigned long) _start));

	codepages = PAGE_ALIGN(codepages) >> PAGE_SHIFT;
@@ -2111,37 +2110,22 @@ void free_initmem(void) 
	initend = (unsigned long)(__init_end) & PAGE_MASK;

	for (; addr < initend; addr += PAGE_SIZE) {

		unsigned long page;

		struct page *p;



		page = (addr +

			((unsigned long) __va(kern_base)) -

			((unsigned long) KERNBASE));

		memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);



		if (do_free) {

			p = virt_to_page(page);



			ClearPageReserved(p);

			init_page_count(p);

			__free_page(p);

			totalram_pages++;

		}

		if (do_free)

			free_reserved_page(virt_to_page(page));

	}

}



#ifdef CONFIG_BLK_DEV_INITRD

void free_initrd_mem(unsigned long start, unsigned long end)

{

	if (start < end)

		printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);

	for (; start < end; start += PAGE_SIZE) {

		struct page *p = virt_to_page(start);



		ClearPageReserved(p);

		init_page_count(p);

		__free_page(p);

		totalram_pages++;

	}

	num_physpages += free_reserved_area(start, end, POISON_FREE_INITMEM,

					    "initrd");

}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE