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

Commit c61a39e1 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: disable fault around on emulated access bit architecture"

parents b585ff85 0b5f9f72

drivers/staging/android/ion/ion_system_heap.c

+9 −0
Original line number Diff line number Diff line
@@ -108,8 +108,13 @@ void free_buffer_page(struct ion_system_heap *heap, 
			ion_page_pool_free_immediate(pool, page);

		else

			ion_page_pool_free(pool, page);



		mod_node_page_state(page_pgdat(page), NR_UNRECLAIMABLE_PAGES,

				    -(1 << pool->order));

	} else {

		__free_pages(page, order);

		mod_node_page_state(page_pgdat(page), NR_UNRECLAIMABLE_PAGES,

				    -(1 << order));

	}

}
@@ -311,6 +316,10 @@ static int ion_system_heap_allocate(struct ion_heap *heap, 


		sz = (1 << info->order) * PAGE_SIZE;



		mod_node_page_state(page_pgdat(info->page),

				    NR_UNRECLAIMABLE_PAGES,

				    (1 << (info->order)));



		if (info->from_pool) {

			list_add_tail(&info->list, &pages_from_pool);

		} else {

fs/proc/meminfo.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) 
	show_val_kb(m, "Committed_AS:   ", committed);

	seq_printf(m, "VmallocTotal:   %8lu kB\n",

		   (unsigned long)VMALLOC_TOTAL >> 10);

	show_val_kb(m, "VmallocUsed:    ", 0ul);

	show_val_kb(m, "VmallocUsed:    ", vmalloc_nr_pages());

	show_val_kb(m, "VmallocChunk:   ", 0ul);

	show_val_kb(m, "Percpu:         ", pcpu_nr_pages());

include/linux/mm_types_task.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ enum { 
	MM_ANONPAGES,	/* Resident anonymous pages */

	MM_SWAPENTS,	/* Anonymous swap entries */

	MM_SHMEMPAGES,	/* Resident shared memory pages */

	MM_UNRECLAIMABLE,	/* Unreclaimable pages, e.g. shared with HW */

	NR_MM_COUNTERS

};

include/linux/mmzone.h

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ enum node_stat_item { 
	NR_DIRTIED,		/* page dirtyings since bootup */

	NR_WRITTEN,		/* page writings since bootup */

	NR_INDIRECTLY_RECLAIMABLE_BYTES, /* measured in bytes */

	NR_UNRECLAIMABLE_PAGES,

	NR_VM_NODE_STAT_ITEMS

};

include/linux/vmalloc.h

+2 −0
Original line number Diff line number Diff line
@@ -63,10 +63,12 @@ extern void vm_unmap_aliases(void); 


#ifdef CONFIG_MMU

extern void __init vmalloc_init(void);

extern unsigned long vmalloc_nr_pages(void);

#else

static inline void vmalloc_init(void)

{

}

static inline unsigned long vmalloc_nr_pages(void) { return 0; }

#endif



extern void *vmalloc(unsigned long size);