Messages in this thread Patch in this message | | | Subject | Re: Linux 4.10-rc1 | From | Kefeng Wang <> | Date | Mon, 26 Dec 2016 17:05:37 +0800 |
| |
On 2016/12/26 16:38, Hanjun Guo wrote: > Hi Linus, > > On 2016/12/26 8:41, Linus Torvalds wrote: >> It's Christmas Day, and it's two weeks since the merge window opened. >> Thus, the merge window is now closed. >> >> I did a few final pulls today, but I also rejected a couple of pulls >> that came in late in the window and looked dodgy. You know who you >> are. >> >> On the whole, this wasn't all that big a release - nothing like 4.9. >> Although it wasn't tiny either. I think 4.7 was smaller. 4.8 might >> have been too. It's xmas day, and right now I can't be arsed to >> actually do the statistics I'd normally do. >> >> Everything looks pretty normal, although we had an unusual amount of >> tree-wide final cleanups in the last days of the merge window. But the >> general statistics look fairly common: a bit over half is drivers, >> maybe slightly less arch updates than normal, and a fair amount of >> documentation updates due to the sphinx conversion. And then the usual >> misc noise all over, although the perf tooling updates do stand out. >> >> The shortlog is much too big, as it always is during the merge window, >> so as usual you just get the merge-log. > > Kejian and I got massive compile error when cross-compile the kernel for ARM64, such as > > ./include/asm-generic/atomic-long.h:23: Error: unknown mnemonic `typedef' -- `typedef atomic64_t atomic_long_t' > ./include/asm-generic/atomic-long.h:44: Error: unknown mnemonic `static' -- `static inline long atomic_long_read(const atomic_long_t*l){atomic64_t*v=(atomic64_t*)l' > ./include/asm-generic/atomic-long.h:44: Error: unknown mnemonic `return' -- `return (long)READ_ONCE((v)->counter)' > ./include/asm-generic/atomic-long.h:44: Error: junk at end of line, first unrecognized character is `}' > ./include/asm-generic/atomic-long.h:45: Error: unknown mnemonic `static' -- `static inline long atomic_long_read_acquire(const atomic_long_t*l){atomic64_t*v=(atomic64_t*)l' > ./include/asm-generic/atomic-long.h:45: Error: unknown mnemonic `return' -- `return (long)smp_load_acquire(&(v)->counter)' > ./include/asm-generic/atomic-long.h:45: Error: junk at end of line, first unrecognized character is `}' > ./include/asm-generic/atomic-long.h:56: Error: unknown mnemonic `static' -- `static inline void atomic_long_set(atomic_long_t*l,long i){atomic64_t*v=(atomic64_t*)l' > ./include/asm-generic/atomic-long.h:56: Error: unknown mnemonic `write_once' -- `write_once(((v)->counter), (i))' > ./include/asm-generic/atomic-long.h:56: Error: junk at end of line, first unrecognized character is `}' > ./include/asm-generic/atomic-long.h:57: Error: unknown mnemonic `static' -- `static inline void atomic_long_set_release(atomic_long_t*l,long i){atomic64_t*v=(atomic64_t*)l' > ./include/asm-generic/atomic-long.h:57: Error: unknown mnemonic `smp_store_release' -- `smp_store_release(&(v)->counter, (i))' > ./include/asm-generic/atomic-long.h:57: Error: junk at end of line, first unrecognized character is `}' > ./include/asm-generic/atomic-long.h:69: Error: unknown mnemonic `static' -- `static inline long atomic_long_add_return(long i,atomic_long_t*l){atomic64_t*v=(atomic64_t*)l' > ./include/asm-generic/atomic-long.h:69: Error: unknown mnemonic `return' -- `return (long)atomic64_add_return(i,v)' > ./include/asm-generic/atomic-long.h:69: Error: junk at end of line, first unrecognized character is `}' > ./include/asm-generic/atomic-long.h:70: Error: unknown mnemonic `static' -- `static inline long atomic_long_add_return_relaxed(long i,atomic_long_t*l){atomic64_t*v=(atomic64_t*)l' > ./include/asm-generic/atomic-long.h:70: Error: unknown mnemonic `return' -- `return (long)atomic64_add_return_relaxed(i,v)' > ./include/asm-generic/atomic-long.h:70: Error: junk at end of line, first unrecognized character is `}' > ./include/asm-generic/atomic-long.h:71: Error: unknown mnemonic `static' -- `static inline long atomic_long_add_return_acquire(long i,atomic_long_t*l){atomic64_t*v=(atomic64_t*)l' > ./include/asm-generic/atomic-long.h:71: Error: unknown mnemonic `return' -- `return (long)atomic64_add_return_acquire(i,v)' > ./include/asm-generic/atomic-long.h:71: Error: junk at end of line, first unrecognized character is `}' > ./include/asm-generic/atomic-long.h:72: Error: unknown mnemonic `static' -- `static inline long atomic_long_add_return_release(long i,atomic_long_t*l){atomic64_t*v=(atomic64_t*)l' > ./include/asm-generic/atomic-long.h:72: Error: unknown mnemonic `return' -- `return (long)atomic64_add_return_release(i,v)' > ./include/asm-generic/atomic-long.h:72: Error: junk at end of line, first unrecognized character is `}' > ./include/asm-generic/atomic-long.h:73: Error: unknown mnemonic `static' -- `static inline long atomic_long_sub_return(long i,atomic_long_t*l){atomic64_t*v=(atomic64_t*)l' > ./include/asm-generic/atomic-long.h:73: Error: unknown mnemonic `return' -- `return (long)atomic64_sub_return(i,v)' > ./include/asm-generic/atomic-long.h:73: Error: junk at end of line, first unrecognized character is `}' > ./include/asm-generic/atomic-long.h:74: Error: unknown mnemonic `static' -- `static inline long atomic_long_sub_return_relaxed(long i,atomic_long_t*l){atomic64_t*v=(atomic64_t*)l' > ./include/asm-generic/atomic-long.h:74: Error: unknown mnemonic `return' -- `return (long)atomic64_sub_return_relaxed(i,v)' > ./include/asm-generic/atomic-long.h:74: Error: junk at end of line, first unrecognized character is `}' > ./include/asm-generic/atomic-long.h:75: Error: unknown mnemonic `static' -- `static inline long atomic_long_sub_return_acquire(long i,atomic_long_t*l){atomic64_t*v=(atomic64_t*)l' > ./include/asm-generic/atomic-long.h:75: Error: unknown mnemonic `return' -- `return (long)atomic64_sub_return_acquire(i,v)' > ./include/asm-generic/atomic-long.h:75: Error: junk at end of line, first unrecognized character is `}' > ./include/asm-generic/atomic-long.h:76: Error: unknown mnemonic `static' -- `static inline long atomic_long_sub_return_release(long i,atomic_long_t*l){atomic64_t*v=(atomic64_t*)l' > ./include/asm-generic/atomic-long.h:76: Error: unknown mnemonic `return' -- `return (long)atomic64_sub_return_release(i,v)' > ./include/asm-generic/atomic-long.h:76: Error: junk at end of line, first unrecognized character is `}' > ./include/asm-generic/atomic-long.h:101: Error: unknown mnemonic `static' -- `static inline void atomic_long_inc(atomic_long_t*l)' > ./include/asm-generic/atomic-long.h:102: Error: junk at end of line, first unrecognized character is `{' > ./include/asm-generic/atomic-long.h:103: Error: unknown mnemonic `atomic64_t' -- `atomic64_t *v=(atomic64_t*)l' > ./include/asm-generic/atomic-long.h:105: Error: unknown mnemonic `atomic64_add' -- `atomic64_add(1, (v))' > ./include/asm-generic/atomic-long.h:106: Error: junk at end of line, first unrecognized character is `}' > ./include/asm-generic/atomic-long.h:108: Error: unknown mnemonic `static' -- `static inline void atomic_long_dec(atomic_long_t*l)' > ./include/asm-generic/atomic-long.h:109: Error: junk at end of line, first unrecognized character is `{' > ./include/asm-generic/atomic-long.h:110: Error: unknown mnemonic `atomic64_t' -- `atomic64_t *v=(atomic64_t*)l' > ./include/asm-generic/atomic-long.h:112: Error: unknown mnemonic `atomic64_sub' -- `atomic64_sub(1, (v))' > ./include/asm-generic/atomic-long.h:113: Error: junk at end of line, first unrecognized character is `}' > > bisect to commit 7c0f6ba682b9c7632072ffbedf8d328c8f3c42ba > > commit 7c0f6ba682b9c7632072ffbedf8d328c8f3c42ba > Author: Linus Torvalds <torvalds@linux-foundation.org> > Date: Sat Dec 24 11:46:01 2016 -0800 > > Replace <asm/uaccess.h> with <linux/uaccess.h> globally > > This was entirely automated, using the script by Al: > > PATT='^[[:blank:]]*#[[:blank:]]*include[[:blank:]]*<asm/uaccess.h>' > sed -i -e "s!$PATT!#include <linux/uaccess.h>!" \ > $(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 <viro@zeniv.linux.org.uk> > Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> > > I reverted and things back to normal, report it now to see if anyone > has clue.
It looks like we need revert the changes from assembly files.
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index a7504f4..4f0d763 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -31,7 +31,7 @@ #include <asm/memory.h> #include <asm/ptrace.h> #include <asm/thread_info.h> -#include <linux/uaccess.h> +#include <asm/uaccess.h> #include <asm/unistd.h>
/* diff --git a/arch/arm64/lib/clear_user.S b/arch/arm64/lib/clear_user.S index add4a13..d7150e3 100644 --- a/arch/arm64/lib/clear_user.S +++ b/arch/arm64/lib/clear_user.S @@ -17,7 +17,7 @@ */ #include <linux/linkage.h>
-#include <linux/uaccess.h> +#include <asm/uaccess.h>
.text
diff --git a/arch/arm64/lib/copy_from_user.S b/arch/arm64/lib/copy_from_user.S index fd6cd05..cfe1339 100644 --- a/arch/arm64/lib/copy_from_user.S +++ b/arch/arm64/lib/copy_from_user.S @@ -17,7 +17,7 @@ #include <linux/linkage.h>
#include <asm/cache.h> -#include <linux/uaccess.h> +#include <asm/uaccess.h>
/* * Copy from user space to a kernel buffer (alignment handled by the hardware) diff --git a/arch/arm64/lib/copy_in_user.S b/arch/arm64/lib/copy_in_user.S index d828540..718b1c4 100644 --- a/arch/arm64/lib/copy_in_user.S +++ b/arch/arm64/lib/copy_in_user.S @@ -19,7 +19,7 @@ #include <linux/linkage.h>
#include <asm/cache.h> -#include <linux/uaccess.h> +#include <asm/uaccess.h>
/* * Copy from user space to user space (alignment handled by the hardware) diff --git a/arch/arm64/lib/copy_to_user.S b/arch/arm64/lib/copy_to_user.S index 3e6ae26..e99e31c 100644 --- a/arch/arm64/lib/copy_to_user.S +++ b/arch/arm64/lib/copy_to_user.S @@ -17,7 +17,7 @@ #include <linux/linkage.h>
#include <asm/cache.h> -#include <linux/uaccess.h> +#include <asm/uaccess.h>
/* * Copy to user space from a kernel buffer (alignment handled by the hardware) diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S index 17f422a..da95769 100644 --- a/arch/arm64/mm/cache.S +++ b/arch/arm64/mm/cache.S @@ -23,7 +23,7 @@ #include <asm/assembler.h> #include <asm/cpufeature.h> #include <asm/alternative.h> -#include <linux/uaccess.h> +#include <asm/uaccess.h>
/* * flush_icache_range(start,end) diff --git a/arch/arm64/xen/hypercall.S b/arch/arm64/xen/hypercall.S index 47cf3f9..b41aff2 100644 --- a/arch/arm64/xen/hypercall.S +++ b/arch/arm64/xen/hypercall.S @@ -49,7 +49,7 @@
#include <linux/linkage.h> #include <asm/assembler.h> -#include <linux/uaccess.h> +#include <asm/uaccess.h> #include <xen/interface/xen.h>
> > Thanks > Hanjun > > _______________________________________________ > linuxarm mailing list > linuxarm@huawei.com > http://rnd-openeuler.huawei.com/mailman/listinfo/linuxarm > > . >
| |