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

Commit e37704d2 authored by Dmitry Shmidt's avatar Dmitry Shmidt
Browse files

Merge tag 'v4.9.8' into android-4.9 

This is the 4.9.8 stable release
parents dc89d136 c8ea2f3b

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 6

SUBLEVEL = 8

EXTRAVERSION =

NAME = Roaring Lionus

arch/arc/include/asm/delay.h

+3 −1
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ static inline void __delay(unsigned long loops) 
	"	lp  1f			\n"

	"	nop			\n"

	"1:				\n"

	: : "r"(loops));

	:

        : "r"(loops)

        : "lp_count");

}



extern void __bad_udelay(void);

arch/arc/kernel/unaligned.c

+2 −1
Original line number Diff line number Diff line
@@ -241,8 +241,9 @@ int misaligned_fixup(unsigned long address, struct pt_regs *regs, 
	if (state.fault)

		goto fault;



	/* clear any remanants of delay slot */

	if (delay_mode(regs)) {

		regs->ret = regs->bta;

		regs->ret = regs->bta ~1U;

		regs->status32 &= ~STATUS_DE_MASK;

	} else {

		regs->ret += state.instr_len;

arch/parisc/include/asm/bitops.h

+7 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#endif



#include <linux/compiler.h>

#include <asm/types.h>		/* for BITS_PER_LONG/SHIFT_PER_LONG */

#include <asm/types.h>

#include <asm/byteorder.h>

#include <asm/barrier.h>

#include <linux/atomic.h>
@@ -17,6 +17,12 @@ 
 * to include/asm-i386/bitops.h or kerneldoc

 */



#if __BITS_PER_LONG == 64

#define SHIFT_PER_LONG 6

#else

#define SHIFT_PER_LONG 5

#endif



#define CHOP_SHIFTCOUNT(x) (((unsigned long) (x)) & (BITS_PER_LONG - 1))

arch/parisc/include/uapi/asm/bitsperlong.h

+0 −2
Original line number Diff line number Diff line
@@ -3,10 +3,8 @@ 


#if defined(__LP64__)

#define __BITS_PER_LONG 64

#define SHIFT_PER_LONG 6

#else

#define __BITS_PER_LONG 32

#define SHIFT_PER_LONG 5

#endif



#include <asm-generic/bitsperlong.h>