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

Commit 74e9081f authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch '4.9/tmp-6bf53d41' into msm-4.9" into msm-4.9

parents 7aea575f 4891f6a5

Documentation/networking/ip-sysctl.txt

+11 −2
Original line number Diff line number Diff line
@@ -1462,11 +1462,20 @@ accept_ra_pinfo - BOOLEAN 
	Functional default: enabled if accept_ra is enabled.

			    disabled if accept_ra is disabled.



accept_ra_rt_info_min_plen - INTEGER

	Minimum prefix length of Route Information in RA.



	Route Information w/ prefix smaller than this variable shall

	be ignored.



	Functional default: 0 if accept_ra_rtr_pref is enabled.

			    -1 if accept_ra_rtr_pref is disabled.



accept_ra_rt_info_max_plen - INTEGER

	Maximum prefix length of Route Information in RA.



	Route Information w/ prefix larger than or equal to this

	variable shall be ignored.

	Route Information w/ prefix larger than this variable shall

	be ignored.



	Functional default: 0 if accept_ra_rtr_pref is enabled.

			    -1 if accept_ra_rtr_pref is disabled.

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 17

SUBLEVEL = 18

EXTRAVERSION =

NAME = Roaring Lionus

arch/parisc/include/asm/cacheflush.h

+2 −21
Original line number Diff line number Diff line
@@ -45,28 +45,9 @@ static inline void flush_kernel_dcache_page(struct page *page) 


#define flush_kernel_dcache_range(start,size) \

	flush_kernel_dcache_range_asm((start), (start)+(size));

/* vmap range flushes and invalidates.  Architecturally, we don't need

 * the invalidate, because the CPU should refuse to speculate once an

 * area has been flushed, so invalidate is left empty */

static inline void flush_kernel_vmap_range(void *vaddr, int size)

{

	unsigned long start = (unsigned long)vaddr;



	flush_kernel_dcache_range_asm(start, start + size);

}

static inline void invalidate_kernel_vmap_range(void *vaddr, int size)

{

	unsigned long start = (unsigned long)vaddr;

	void *cursor = vaddr;



	for ( ; cursor < vaddr + size; cursor += PAGE_SIZE) {

		struct page *page = vmalloc_to_page(cursor);



		if (test_and_clear_bit(PG_dcache_dirty, &page->flags))

			flush_kernel_dcache_page(page);

	}

	flush_kernel_dcache_range_asm(start, start + size);

}

void flush_kernel_vmap_range(void *vaddr, int size);

void invalidate_kernel_vmap_range(void *vaddr, int size);



#define flush_cache_vmap(start, end)		flush_cache_all()

#define flush_cache_vunmap(start, end)		flush_cache_all()

arch/parisc/kernel/cache.c

+22 −0
Original line number Diff line number Diff line
@@ -633,3 +633,25 @@ flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, unsigned long 
		__flush_cache_page(vma, vmaddr, PFN_PHYS(pfn));

	}

}



void flush_kernel_vmap_range(void *vaddr, int size)

{

	unsigned long start = (unsigned long)vaddr;



	if ((unsigned long)size > parisc_cache_flush_threshold)

		flush_data_cache();

	else

		flush_kernel_dcache_range_asm(start, start + size);

}

EXPORT_SYMBOL(flush_kernel_vmap_range);



void invalidate_kernel_vmap_range(void *vaddr, int size)

{

	unsigned long start = (unsigned long)vaddr;



	if ((unsigned long)size > parisc_cache_flush_threshold)

		flush_data_cache();

	else

		flush_kernel_dcache_range_asm(start, start + size);

}

EXPORT_SYMBOL(invalidate_kernel_vmap_range);

arch/parisc/kernel/process.c

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ void machine_power_off(void) 


	printk(KERN_EMERG "System shut down completed.\n"

	       "Please power this system off now.");



	for (;;);

}



void (*pm_power_off)(void) = machine_power_off;