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

Unverified Commit 464c5b7a authored by derfelot's avatar derfelot Committed by GitHub
Browse files

Merge pull request #47 from Flamefire/lineage-4.4.288 

Update kernel to 4.4.288
parents 1ae10f4a 726236a2

Documentation/devicetree/bindings/mtd/gpmc-nand.txt

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ on various other factors also like; 
	so the device should have enough free bytes available its OOB/Spare

	area to accommodate ECC for entire page. In general following expression

	helps in determining if given device can accommodate ECC syndrome:

	"2 + (PAGESIZE / 512) * ECC_BYTES" >= OOBSIZE"

	"2 + (PAGESIZE / 512) * ECC_BYTES" <= OOBSIZE"

	where

		OOBSIZE		number of bytes in OOB/spare area

		PAGESIZE	number of bytes in main-area of device page

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 283

SUBLEVEL = 288

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/alpha/include/asm/io.h

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ extern inline void set_hae(unsigned long new_hae) 
 * Change virtual addresses to physical addresses and vv.

 */

#ifdef USE_48_BIT_KSEG

static inline unsigned long virt_to_phys(void *address)

static inline unsigned long virt_to_phys(volatile void *address)

{

	return (unsigned long)address - IDENT_ADDR;

}
@@ -70,7 +70,7 @@ static inline void * phys_to_virt(unsigned long address) 
	return (void *) (address + IDENT_ADDR);

}

#else

static inline unsigned long virt_to_phys(void *address)

static inline unsigned long virt_to_phys(volatile void *address)

{

        unsigned long phys = (unsigned long)address;
@@ -111,7 +111,7 @@ static inline dma_addr_t __deprecated isa_page_to_bus(struct page *page) 
extern unsigned long __direct_map_base;

extern unsigned long __direct_map_size;



static inline unsigned long __deprecated virt_to_bus(void *address)

static inline unsigned long __deprecated virt_to_bus(volatile void *address)

{

	unsigned long phys = virt_to_phys(address);

	unsigned long bus = phys + __direct_map_base;

arch/arc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ config ARC 
	select GENERIC_SMP_IDLE_THREAD

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_TRACEHOOK

	select HAVE_FUTEX_CMPXCHG

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_IOREMAP_PROT

	select HAVE_KPROBES

	select HAVE_KRETPROBES

arch/arc/mm/cache.c

+1 −1
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ void clear_user_page(void *to, unsigned long u_vaddr, struct page *page) 
	clear_page(to);

	clear_bit(PG_dc_clean, &page->flags);

}



EXPORT_SYMBOL(clear_user_page);



/**********************************************************************

 * Explicit Cache flush request from user space via syscall