xavi/android_kernel_m2note/arch/um, branch o-8.1

Replace with globally

2018-11-29T17:33:35+00:00

This was entirely automated, using the script by Al: PATT='^[[:blank:]]*#[[:blank:]]*include[[:blank:]]*' sed -i -e "s!$PATT!#include !" \ $(git grep -l "$PATT"|grep -v ^include/linux/uaccess.h) to do the replacement at the end of the merge window. Requested-by: Al Viro Signed-off-by: Linus Torvalds Signed-off-by: Moyster

um: defconfig: use a better defconfig for recent tests

2017-05-04T19:15:30+00:00

um: fix build

2017-05-04T19:00:01+00:00

um: Remove copy&paste code from init.h

2017-05-03T13:31:35+00:00

As we got rid of the __KERNEL__ abuse, we can directly include linux/compiler.h now. This also allows gcc 5 to build UML. Reported-by: Hans-Werner Hilse Signed-off-by: Richard Weinberger

um: Stop abusing KERNEL

2017-05-03T13:31:14+00:00

Currently UML is abusing __KERNEL__ to distinguish between kernel and host code (os-Linux). It is better to use a custom define such that existing users of __KERNEL__ don't get confused. Signed-off-by: Richard Weinberger

locking/mcs: Allow architecture specific asm files to be used for contended case

2017-05-03T13:21:33+00:00

This patch allows each architecture to add its specific assembly optimized arch_mcs_spin_lock_contended and arch_mcs_spinlock_uncontended for MCS lock and unlock functions. Signed-off-by: Tim Chen Cc: Scott J Norton Cc: Raghavendra K T Cc: AswinChandramouleeswaran Cc: George Spelvin Cc: Rik vanRiel Cc: Andrea Arcangeli Cc: MichelLespinasse Cc: Peter Hurley Cc: Andi Kleen Cc: Alex Shi Cc: Dave Hansen Cc: Tim Chen Cc: Arnd Bergmann Cc: "Figo.zhang" Cc: "Paul E.McKenney" Cc: "H. Peter Anvin" Cc: Davidlohr Bueso Cc: Waiman Long Cc: Ingo Molnar Cc: Will Deacon Cc: Andrew Morton Cc: Linus Torvalds Cc: Matthew R Wilcox Signed-off-by: Peter Zijlstra Link: http://lkml.kernel.org/r/1390347382.3138.67.camel@schen9-DESK Signed-off-by: Ingo Molnar Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git Git-commit: ddf1d169c0a489d498c1799a7043904a43b0c159 [joonwoop@codeaurora.org: Resolve merge conflicts; we don't have changes for arch other than ARM/ARM64] Signed-off-by: Joonwoo Park

locking/mcs: Order the header files in Kbuild of each architecture in alphabetical order

2017-05-03T13:20:57+00:00

We perform a clean up of the Kbuid files in each architecture. We order the files in each Kbuild in alphabetical order by running the below script. for i in arch/*/include/asm/Kbuild do cat $i | gawk '/^generic-y/ { i = 3; do { for (; i <= NF; i++) { if ($i == "\\") { getline; i = 1; continue; } if ($i != "") hdr[$i] = $i; } break; } while (1); next; } // { print $0; } END { n = asort(hdr); for (i = 1; i <= n; i++) print "generic-y += " hdr[i]; }' > ${i}.sorted; mv ${i}.sorted $i; done Signed-off-by: Tim Chen Cc: Arnd Bergmann Cc: Matthew R Wilcox Cc: AswinChandramouleeswaran Cc: Dave Hansen Cc: "Paul E.McKenney" Cc: Scott J Norton Cc: Will Deacon Cc: "Figo.zhang" Cc: Linus Torvalds Cc: Rik van Riel Cc: Waiman Long Cc: Peter Hurley Cc: Andrea Arcangeli Cc: Tim Chen Cc: Alex Shi Cc: Raghavendra K T Cc: Andi Kleen Cc: George Spelvin Cc: MichelLespinasse Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Davidlohr Bueso Cc: Andrew Morton Signed-off-by: Peter Zijlstra [ Fixed build bug. ] Signed-off-by: Ingo Molnar Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git Git-commit: b119fa61d440fe0f5af504299ad506637585a8ca [joonwoop@codeaurora.org: resolved conflict due to missing Kbuild files.] Signed-off-by: Joonwoo Park

um: Kbuild: Add back generic barrier.h

2017-05-03T13:01:05+00:00

This is needed for building nettest on ARCH=um This fixes multiple instances of "error: implicit declaration of function smp_mb__after_atomic()" for various kernel headers. Change-Id: Icd9db5088a4c38909eaa0b9e789706d17abf1e42 Signed-off-by: Naveen Ramaraj

Fix compiler warning in UML code.

2017-05-03T12:56:40+00:00

Simply putting (void) in front of the function call does not fix the warning in GCC. This is working as intended; see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25509#c26 Bug: 21631098 Change-Id: I3aff39752242923dab8b837df2b9ea697316165e

um: siginfo cleanup

2017-05-03T12:56:24+00:00

Currently we use both struct siginfo and siginfo_t. Let's use struct siginfo internally to avoid ongoing compiler warning. We are allowed to do so because struct siginfo and siginfo_t are equivalent. [cherry-pick of upstream 9a8c1359571c5d5e2fbc43cf457a6486b70a70cb] Bug: 21631098 Change-Id: I564775c9ed515c39ffff7d7d600a85d50291f31d Signed-off-by: Richard Weinberger Signed-off-by: Lorenzo Colitti