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

Commit d2d693d1 authored by Alex Shi's avatar Alex Shi
Browse files

Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4 

Conflicts:
	set ARM64_WORKAROUND_CAVIUM_27456 to 12 in
	arch/arm64/include/asm/cpufeature.h
	and add asm/memory.h in arch/arm64/kernel/entry.S
parents 57378734 1d074db6

Documentation/filesystems/proc.txt

+3 −6
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ address perms offset dev inode pathname 
a7cb1000-a7cb2000 ---p 00000000 00:00 0

a7cb2000-a7eb2000 rw-p 00000000 00:00 0

a7eb2000-a7eb3000 ---p 00000000 00:00 0

a7eb3000-a7ed5000 rw-p 00000000 00:00 0          [stack:1001]

a7eb3000-a7ed5000 rw-p 00000000 00:00 0

a7ed5000-a8008000 r-xp 00000000 03:00 4222       /lib/libc.so.6

a8008000-a800a000 r--p 00133000 03:00 4222       /lib/libc.so.6

a800a000-a800b000 rw-p 00135000 03:00 4222       /lib/libc.so.6
@@ -378,7 +378,6 @@ is not associated with a file: 


 [heap]                   = the heap of the program

 [stack]                  = the stack of the main process

 [stack:1001]             = the stack of the thread with tid 1001

 [vdso]                   = the "virtual dynamic shared object",

                            the kernel system call handler
@@ -386,10 +385,8 @@ is not associated with a file: 


The /proc/PID/task/TID/maps is a view of the virtual memory from the viewpoint

of the individual tasks of a process. In this file you will see a mapping marked

as [stack] if that task sees it as a stack. This is a key difference from the

content of /proc/PID/maps, where you will see all mappings that are being used

as stack by all of those tasks. Hence, for the example above, the task-level

map, i.e. /proc/PID/task/TID/maps for thread 1001 will look like this:

as [stack] if that task sees it as a stack. Hence, for the example above, the

task-level map, i.e. /proc/PID/task/TID/maps for thread 1001 will look like this:



08048000-08049000 r-xp 00000000 03:00 8312       /opt/test

08049000-0804a000 rw-p 00001000 03:00 8312       /opt/test

Documentation/module-signing.txt

+6 −0
Original line number Diff line number Diff line
@@ -271,3 +271,9 @@ Since the private key is used to sign modules, viruses and malware could use 
the private key to sign modules and compromise the operating system.  The

private key must be either destroyed or moved to a secure location and not kept

in the root node of the kernel source tree.



If you use the same private key to sign modules for multiple kernel

configurations, you must ensure that the module version information is

sufficient to prevent loading a module into a different kernel.  Either

set CONFIG_MODVERSIONS=y or ensure that each configuration has a different

kernel release string by changing EXTRAVERSION or CONFIG_LOCALVERSION.

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 18

SUBLEVEL = 21

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arc/Makefile

+14 −0
Original line number Diff line number Diff line
@@ -18,6 +18,20 @@ cflags-y += -fno-common -pipe -fno-builtin -D__linux__ 
cflags-$(CONFIG_ISA_ARCOMPACT)	+= -mA7

cflags-$(CONFIG_ISA_ARCV2)	+= -mcpu=archs



is_700 = $(shell $(CC) -dM -E - < /dev/null | grep -q "ARC700" && echo 1 || echo 0)



ifdef CONFIG_ISA_ARCOMPACT

ifeq ($(is_700), 0)

    $(error Toolchain not configured for ARCompact builds)

endif

endif



ifdef CONFIG_ISA_ARCV2

ifeq ($(is_700), 1)

    $(error Toolchain not configured for ARCv2 builds)

endif

endif



ifdef CONFIG_ARC_CURR_IN_REG

# For a global register defintion, make sure it gets passed to every file

# We had a customer reported bug where some code built in kernel was NOT using

arch/arc/include/asm/arcregs.h

+0 −6
Original line number Diff line number Diff line
@@ -374,12 +374,6 @@ static inline int is_isa_arcompact(void) 
	return IS_ENABLED(CONFIG_ISA_ARCOMPACT);

}



#if defined(CONFIG_ISA_ARCOMPACT) && !defined(_CPU_DEFAULT_A7)

#error "Toolchain not configured for ARCompact builds"

#elif defined(CONFIG_ISA_ARCV2) && !defined(_CPU_DEFAULT_HS)

#error "Toolchain not configured for ARCv2 builds"

#endif



#endif /* __ASEMBLY__ */



#endif /* _ASM_ARC_ARCREGS_H */