# git rev-parse -q --verify 8f135b2491cf854a88a0adb2c567f37573e31240^{commit} 8f135b2491cf854a88a0adb2c567f37573e31240 already have revision, skipping fetch # git checkout -q -f -B kisskb 8f135b2491cf854a88a0adb2c567f37573e31240 # git clean -qxdf # < git log -1 # commit 8f135b2491cf854a88a0adb2c567f37573e31240 # Author: Christophe Leroy # Date: Mon May 28 12:31:19 2018 +0000 # # powerpc/8xx: set GUARDED attribute in the PMD directly # # On the 8xx, the GUARDED attribute of the pages is managed in the # L1 entry, therefore to avoid having to copy it into L1 entry # at each TLB miss, we set it in the PMD. # # Signed-off-by: Christophe Leroy # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < git log --format=%s --max-count=1 8f135b2491cf854a88a0adb2c567f37573e31240 # < make -s -j 80 ARCH=powerpc O=/kisskb/build/chleroy_ppc64le_defconfig_ppc64le-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ppc64le_defconfig # make -s -j 80 ARCH=powerpc O=/kisskb/build/chleroy_ppc64le_defconfig_ppc64le-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/arch/powerpc/include/asm/lppaca.h:36:0, from /kisskb/src/arch/powerpc/include/asm/paca.h:21, from /kisskb/src/arch/powerpc/include/asm/hw_irq.h:64, from /kisskb/src/arch/powerpc/include/asm/irqflags.h:12, from /kisskb/src/include/linux/irqflags.h:16, from /kisskb/src/include/linux/spinlock.h:54, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/compat.h:12, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/mmu.h:329:7: warning: extra tokens at end of #else directive [-Wendif-labels] #else if defined(CONFIG_PPC_MMU_NOHASH) ^ In file included from /kisskb/src/arch/powerpc/include/asm/nohash/64/mmu.h:6:0, from /kisskb/src/arch/powerpc/include/asm/nohash/mmu.h:6, from /kisskb/src/arch/powerpc/include/asm/mmu.h:330, from /kisskb/src/arch/powerpc/include/asm/lppaca.h:36, from /kisskb/src/arch/powerpc/include/asm/paca.h:21, from /kisskb/src/arch/powerpc/include/asm/hw_irq.h:64, from /kisskb/src/arch/powerpc/include/asm/irqflags.h:12, from /kisskb/src/include/linux/irqflags.h:16, from /kisskb/src/include/linux/spinlock.h:54, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/compat.h:12, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/nohash/mmu-book3e.h:234:3: error: conflicting types for 'mm_context_t' } mm_context_t; ^ In file included from /kisskb/src/arch/powerpc/include/asm/mmu.h:313:0, from /kisskb/src/arch/powerpc/include/asm/lppaca.h:36, from /kisskb/src/arch/powerpc/include/asm/paca.h:21, from /kisskb/src/arch/powerpc/include/asm/hw_irq.h:64, from /kisskb/src/arch/powerpc/include/asm/irqflags.h:12, from /kisskb/src/include/linux/irqflags.h:16, from /kisskb/src/include/linux/spinlock.h:54, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/compat.h:12, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/book3s/64/mmu.h:162:3: note: previous declaration of 'mm_context_t' was here } mm_context_t; ^ In file included from /kisskb/src/arch/powerpc/include/asm/nohash/64/mmu.h:6:0, from /kisskb/src/arch/powerpc/include/asm/nohash/mmu.h:6, from /kisskb/src/arch/powerpc/include/asm/mmu.h:330, from /kisskb/src/arch/powerpc/include/asm/lppaca.h:36, from /kisskb/src/arch/powerpc/include/asm/paca.h:21, from /kisskb/src/arch/powerpc/include/asm/hw_irq.h:64, from /kisskb/src/arch/powerpc/include/asm/irqflags.h:12, from /kisskb/src/include/linux/irqflags.h:16, from /kisskb/src/include/linux/spinlock.h:54, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/compat.h:12, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/nohash/mmu-book3e.h:242:8: error: redefinition of 'struct mmu_psize_def' struct mmu_psize_def ^ In file included from /kisskb/src/arch/powerpc/include/asm/mmu.h:313:0, from /kisskb/src/arch/powerpc/include/asm/lppaca.h:36, from /kisskb/src/arch/powerpc/include/asm/paca.h:21, from /kisskb/src/arch/powerpc/include/asm/hw_irq.h:64, from /kisskb/src/arch/powerpc/include/asm/irqflags.h:12, from /kisskb/src/include/linux/irqflags.h:16, from /kisskb/src/include/linux/spinlock.h:54, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/compat.h:12, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/book3s/64/mmu.h:15:8: note: originally defined here struct mmu_psize_def { ^ In file included from /kisskb/src/arch/powerpc/include/asm/nohash/64/mmu.h:6:0, from /kisskb/src/arch/powerpc/include/asm/nohash/mmu.h:6, from /kisskb/src/arch/powerpc/include/asm/mmu.h:330, from /kisskb/src/arch/powerpc/include/asm/lppaca.h:36, from /kisskb/src/arch/powerpc/include/asm/paca.h:21, from /kisskb/src/arch/powerpc/include/asm/hw_irq.h:64, from /kisskb/src/arch/powerpc/include/asm/irqflags.h:12, from /kisskb/src/include/linux/irqflags.h:16, from /kisskb/src/include/linux/spinlock.h:54, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/compat.h:12, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/nohash/mmu-book3e.h:251:29: error: conflicting types for 'mmu_psize_defs' extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT]; ^ In file included from /kisskb/src/arch/powerpc/include/asm/mmu.h:313:0, from /kisskb/src/arch/powerpc/include/asm/lppaca.h:36, from /kisskb/src/arch/powerpc/include/asm/paca.h:21, from /kisskb/src/arch/powerpc/include/asm/hw_irq.h:64, from /kisskb/src/arch/powerpc/include/asm/irqflags.h:12, from /kisskb/src/include/linux/irqflags.h:16, from /kisskb/src/include/linux/spinlock.h:54, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/compat.h:12, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/book3s/64/mmu.h:25:29: note: previous declaration of 'mmu_psize_defs' was here extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT]; ^ In file included from /kisskb/src/arch/powerpc/include/asm/nohash/64/mmu.h:6:0, from /kisskb/src/arch/powerpc/include/asm/nohash/mmu.h:6, from /kisskb/src/arch/powerpc/include/asm/mmu.h:330, from /kisskb/src/arch/powerpc/include/asm/lppaca.h:36, from /kisskb/src/arch/powerpc/include/asm/paca.h:21, from /kisskb/src/arch/powerpc/include/asm/hw_irq.h:64, from /kisskb/src/arch/powerpc/include/asm/irqflags.h:12, from /kisskb/src/include/linux/irqflags.h:16, from /kisskb/src/include/linux/spinlock.h:54, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/compat.h:12, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/nohash/mmu-book3e.h:253:19: error: redefinition of 'shift_to_mmu_psize' static inline int shift_to_mmu_psize(unsigned int shift) ^ In file included from /kisskb/src/arch/powerpc/include/asm/book3s/64/mmu.h:37:0, from /kisskb/src/arch/powerpc/include/asm/mmu.h:313, from /kisskb/src/arch/powerpc/include/asm/lppaca.h:36, from /kisskb/src/arch/powerpc/include/asm/paca.h:21, from /kisskb/src/arch/powerpc/include/asm/hw_irq.h:64, from /kisskb/src/arch/powerpc/include/asm/irqflags.h:12, from /kisskb/src/include/linux/irqflags.h:16, from /kisskb/src/include/linux/spinlock.h:54, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/compat.h:12, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/book3s/64/mmu-hash.h:189:19: note: previous definition of 'shift_to_mmu_psize' was here static inline int shift_to_mmu_psize(unsigned int shift) ^ In file included from /kisskb/src/arch/powerpc/include/asm/nohash/64/mmu.h:6:0, from /kisskb/src/arch/powerpc/include/asm/nohash/mmu.h:6, from /kisskb/src/arch/powerpc/include/asm/mmu.h:330, from /kisskb/src/arch/powerpc/include/asm/lppaca.h:36, from /kisskb/src/arch/powerpc/include/asm/paca.h:21, from /kisskb/src/arch/powerpc/include/asm/hw_irq.h:64, from /kisskb/src/arch/powerpc/include/asm/irqflags.h:12, from /kisskb/src/include/linux/irqflags.h:16, from /kisskb/src/include/linux/spinlock.h:54, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/compat.h:12, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/nohash/mmu-book3e.h:263:28: error: redefinition of 'mmu_psize_to_shift' static inline unsigned int mmu_psize_to_shift(unsigned int mmu_psize) ^ In file included from /kisskb/src/arch/powerpc/include/asm/book3s/64/mmu.h:37:0, from /kisskb/src/arch/powerpc/include/asm/mmu.h:313, from /kisskb/src/arch/powerpc/include/asm/lppaca.h:36, from /kisskb/src/arch/powerpc/include/asm/paca.h:21, from /kisskb/src/arch/powerpc/include/asm/hw_irq.h:64, from /kisskb/src/arch/powerpc/include/asm/irqflags.h:12, from /kisskb/src/include/linux/irqflags.h:16, from /kisskb/src/include/linux/spinlock.h:54, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/compat.h:12, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/book3s/64/mmu-hash.h:199:28: note: previous definition of 'mmu_psize_to_shift' was here static inline unsigned int mmu_psize_to_shift(unsigned int mmu_psize) ^ In file included from /kisskb/src/arch/powerpc/include/asm/nohash/64/mmu.h:6:0, from /kisskb/src/arch/powerpc/include/asm/nohash/mmu.h:6, from /kisskb/src/arch/powerpc/include/asm/mmu.h:330, from /kisskb/src/arch/powerpc/include/asm/lppaca.h:36, from /kisskb/src/arch/powerpc/include/asm/paca.h:21, from /kisskb/src/arch/powerpc/include/asm/hw_irq.h:64, from /kisskb/src/arch/powerpc/include/asm/irqflags.h:12, from /kisskb/src/include/linux/irqflags.h:16, from /kisskb/src/include/linux/spinlock.h:54, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/compat.h:12, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/nohash/mmu-book3e.h:276:2: error: #error Unsupported page size #error Unsupported page size ^ In file included from /kisskb/src/arch/powerpc/include/asm/nohash/mmu.h:6:0, from /kisskb/src/arch/powerpc/include/asm/mmu.h:330, from /kisskb/src/arch/powerpc/include/asm/lppaca.h:36, from /kisskb/src/arch/powerpc/include/asm/paca.h:21, from /kisskb/src/arch/powerpc/include/asm/hw_irq.h:64, from /kisskb/src/arch/powerpc/include/asm/irqflags.h:12, from /kisskb/src/include/linux/irqflags.h:16, from /kisskb/src/include/linux/spinlock.h:54, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/compat.h:12, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/nohash/64/mmu.h:9:22: error: conflicting types for 'pgtable_t' typedef struct page *pgtable_t; ^ In file included from /kisskb/src/arch/powerpc/include/asm/mmu.h:313:0, from /kisskb/src/arch/powerpc/include/asm/lppaca.h:36, from /kisskb/src/arch/powerpc/include/asm/paca.h:21, from /kisskb/src/arch/powerpc/include/asm/hw_irq.h:64, from /kisskb/src/arch/powerpc/include/asm/irqflags.h:12, from /kisskb/src/include/linux/irqflags.h:16, from /kisskb/src/include/linux/spinlock.h:54, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/compat.h:12, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/book3s/64/mmu.h:32:16: note: previous declaration of 'pgtable_t' was here typedef pte_t *pgtable_t; ^ In file included from /kisskb/src/arch/powerpc/include/asm/book3s/tlbflush.h:6:0, from /kisskb/src/arch/powerpc/include/asm/tlbflush.h:6, from /kisskb/src/arch/powerpc/include/asm/pgtable.h:11, from /kisskb/src/include/linux/memremap.h:7, from /kisskb/src/include/linux/mm.h:27, from /kisskb/src/include/linux/mman.h:5, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:23: /kisskb/src/arch/powerpc/include/asm/book3s/64/tlbflush.h: In function 'flush_tlb_fix_spurious_fault': /kisskb/src/arch/powerpc/include/asm/book3s/64/tlbflush.h:146:38: error: 'mm_context_t {aka struct }' has no member named 'copros' if (atomic_read(&vma->vm_mm->context.copros) > 0) ^ In file included from /kisskb/src/include/linux/pkeys.h:8:0, from /kisskb/src/arch/powerpc/include/asm/mman.h:16, from /kisskb/src/include/uapi/linux/mman.h:5, from /kisskb/src/include/linux/mman.h:9, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:23: /kisskb/src/arch/powerpc/include/asm/pkeys.h: In function 'mm_pkey_is_allocated': /kisskb/src/arch/powerpc/include/asm/pkeys.h:74:48: error: 'mm_context_t {aka struct }' has no member named 'pkey_allocation_map' #define mm_pkey_allocation_map(mm) (mm->context.pkey_allocation_map) ^ /kisskb/src/arch/powerpc/include/asm/pkeys.h:85:3: note: in expansion of macro 'mm_pkey_allocation_map' (mm_pkey_allocation_map(mm) & pkey_alloc_mask(pkey)) ^ /kisskb/src/arch/powerpc/include/asm/pkeys.h:99:9: note: in expansion of macro '__mm_pkey_is_allocated' return __mm_pkey_is_allocated(mm, pkey); ^ /kisskb/src/arch/powerpc/include/asm/pkeys.h: In function 'mm_pkey_alloc': /kisskb/src/arch/powerpc/include/asm/pkeys.h:74:48: error: 'mm_context_t {aka struct }' has no member named 'pkey_allocation_map' #define mm_pkey_allocation_map(mm) (mm->context.pkey_allocation_map) ^ /kisskb/src/arch/powerpc/include/asm/pkeys.h:124:6: note: in expansion of macro 'mm_pkey_allocation_map' if (mm_pkey_allocation_map(mm) == all_pkeys_mask) ^ In file included from /kisskb/src/arch/powerpc/include/asm/bitops.h:212:0, from /kisskb/src/include/linux/bitops.h:19, from /kisskb/src/include/linux/kernel.h:11, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/preempt.h:11, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/compat.h:12, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:16: /kisskb/src/arch/powerpc/include/asm/pkeys.h:74:48: error: 'mm_context_t {aka struct }' has no member named 'pkey_allocation_map' #define mm_pkey_allocation_map(mm) (mm->context.pkey_allocation_map) ^ /kisskb/src/include/asm-generic/bitops/ffz.h:11:25: note: in definition of macro 'ffz' #define ffz(x) __ffs(~(x)) ^ /kisskb/src/arch/powerpc/include/asm/pkeys.h:127:17: note: in expansion of macro 'mm_pkey_allocation_map' ret = ffz((u32)mm_pkey_allocation_map(mm)); ^ In file included from /kisskb/src/include/linux/pkeys.h:8:0, from /kisskb/src/arch/powerpc/include/asm/mman.h:16, from /kisskb/src/include/uapi/linux/mman.h:5, from /kisskb/src/include/linux/mman.h:9, from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:23: /kisskb/src/arch/powerpc/include/asm/pkeys.h:74:48: error: 'mm_context_t {aka struct }' has no member named 'pkey_allocation_map' #define mm_pkey_allocation_map(mm) (mm->context.pkey_allocation_map) ^ /kisskb/src/arch/powerpc/include/asm/pkeys.h:77:2: note: in expansion of macro 'mm_pkey_allocation_map' mm_pkey_allocation_map(mm) |= pkey_alloc_mask(pkey); \ ^ /kisskb/src/arch/powerpc/include/asm/pkeys.h:128:2: note: in expansion of macro '__mm_pkey_allocated' __mm_pkey_allocated(mm, ret); ^ /kisskb/src/arch/powerpc/include/asm/pkeys.h: In function 'mm_pkey_free': /kisskb/src/arch/powerpc/include/asm/pkeys.h:74:48: error: 'mm_context_t {aka struct }' has no member named 'pkey_allocation_map' #define mm_pkey_allocation_map(mm) (mm->context.pkey_allocation_map) ^ /kisskb/src/arch/powerpc/include/asm/pkeys.h:81:2: note: in expansion of macro 'mm_pkey_allocation_map' mm_pkey_allocation_map(mm) &= ~pkey_alloc_mask(pkey); \ ^ /kisskb/src/arch/powerpc/include/asm/pkeys.h:141:2: note: in expansion of macro '__mm_pkey_free' __mm_pkey_free(mm, pkey); ^ In file included from /kisskb/src/arch/powerpc/kernel/asm-offsets.c:31:0: /kisskb/src/arch/powerpc/kernel/asm-offsets.c: In function 'main': /kisskb/src/include/linux/compiler_types.h:229:35: error: 'struct mmu_psize_def' has no member named 'sllp' #define __compiler_offsetof(a, b) __builtin_offsetof(a, b) ^ /kisskb/src/include/linux/kbuild.h:6:62: note: in definition of macro 'DEFINE' asm volatile("\n.ascii \"->" #sym " %0 " #val "\"" : : "i" (val)) ^ /kisskb/src/include/linux/stddef.h:17:32: note: in expansion of macro '__compiler_offsetof' #define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER) ^ /kisskb/src/include/linux/kbuild.h:11:14: note: in expansion of macro 'offsetof' DEFINE(sym, offsetof(struct str, mem)) ^ /kisskb/src/arch/powerpc/kernel/asm-offsets.c:208:2: note: in expansion of macro 'OFFSET' OFFSET(MMUPSIZESLLP, mmu_psize_def, sllp); ^ make[2]: *** [/kisskb/src/./Kbuild:56: arch/powerpc/kernel/asm-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1112: prepare0] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:146: sub-make] Error 2 Command 'make -s -j 80 ARCH=powerpc O=/kisskb/build/chleroy_ppc64le_defconfig_ppc64le-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/chleroy_ppc64le_defconfig_ppc64le-gcc5 # Build took: 0:00:08.660288