# git rev-parse -q --verify 923dcc5eb0c111eccd51cc7ce1658537e3c38b25^{commit} 923dcc5eb0c111eccd51cc7ce1658537e3c38b25 already have revision, skipping fetch # git checkout -q -f -B kisskb 923dcc5eb0c111eccd51cc7ce1658537e3c38b25 # git clean -qxdf # < git log -1 # commit 923dcc5eb0c111eccd51cc7ce1658537e3c38b25 # Merge: 61564e7b3abc c1e631177119 # Author: Linus Torvalds # Date: Sat Nov 20 13:17:24 2021 -0800 # # Merge branch 'akpm' (patches from Andrew) # # Merge misc fixes from Andrew Morton: # "15 patches. # # Subsystems affected by this patch series: ipc, hexagon, mm (swap, # slab-generic, kmemleak, hugetlb, kasan, damon, and highmem), and proc" # # * emailed patches from Andrew Morton : # proc/vmcore: fix clearing user buffer by properly using clear_user() # kmap_local: don't assume kmap PTEs are linear arrays in memory # mm/damon/dbgfs: fix missed use of damon_dbgfs_lock # mm/damon/dbgfs: use '__GFP_NOWARN' for user-specified size buffer allocation # kasan: test: silence intentional read overflow warnings # hugetlb, userfaultfd: fix reservation restore on userfaultfd error # hugetlb: fix hugetlb cgroup refcounting during mremap # mm: kmemleak: slob: respect SLAB_NOLEAKTRACE flag # hexagon: ignore vmlinux.lds # hexagon: clean up timer-regs.h # hexagon: export raw I/O routines for modules # mm: emit the "free" trace report before freeing memory in kmem_cache_free() # shm: extend forced shm destroy to support objects from several IPC nses # ipc: WARN if trying to remove ipc object which is absent # mm/swap.c:put_pages_list(): reinitialise the page list # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 923dcc5eb0c111eccd51cc7ce1658537e3c38b25 # < make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # < make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:11886:warning: override: reassigning to symbol GCC_PLUGIN_SANCOV .config:11889:warning: override: reassigning to symbol GCC_PLUGIN_RANDSTRUCT .config:11891:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:11893:warning: override: reassigning to symbol UML_NET_SLIP .config:11896:warning: override: reassigning to symbol UML_NET_MCAST .config:11898:warning: override: reassigning to symbol UML_NET_SLIRP # make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 /kisskb/src/arch/x86/um/Makefile:44: FORCE prerequisite is missing /kisskb/src/drivers/video/fbdev/riva/fbdev.c: In function 'rivafb_probe': /kisskb/src/drivers/video/fbdev/riva/fbdev.c:2062:11: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers] iounmap(default_par->riva.PRAMIN); ^ In file included from /kisskb/src/arch/um/include/asm/io.h:7:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/um/include/asm/hardirq.h:5, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/trace_recursion.h:5, from /kisskb/src/include/linux/ftrace.h:10, from /kisskb/src/include/linux/kprobes.h:28, from /kisskb/src/include/linux/kgdb.h:19, from /kisskb/src/include/linux/fb.h:6, from /kisskb/src/drivers/video/fbdev/riva/fbdev.c:39: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile U032 * {aka volatile unsigned int *}' #define iounmap iounmap ^ /kisskb/src/include/asm-generic/logic_io.h:37:6: note: in expansion of macro 'iounmap' void iounmap(void __iomem *addr); ^ /kisskb/src/drivers/video/fbdev/riva/fbdev.c: In function 'rivafb_remove': /kisskb/src/drivers/video/fbdev/riva/fbdev.c:2095:11: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers] iounmap(par->riva.PRAMIN); ^ In file included from /kisskb/src/arch/um/include/asm/io.h:7:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/um/include/asm/hardirq.h:5, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/trace_recursion.h:5, from /kisskb/src/include/linux/ftrace.h:10, from /kisskb/src/include/linux/kprobes.h:28, from /kisskb/src/include/linux/kgdb.h:19, from /kisskb/src/include/linux/fb.h:6, from /kisskb/src/drivers/video/fbdev/riva/fbdev.c:39: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile U032 * {aka volatile unsigned int *}' #define iounmap iounmap ^ /kisskb/src/include/asm-generic/logic_io.h:37:6: note: in expansion of macro 'iounmap' void iounmap(void __iomem *addr); ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:287: drivers/video/fbdev/riva/fbdev.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/video/fbdev/riva] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/video/fbdev] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/video] Error 2 make[2]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/gpu/drm/ttm/ttm_module.c: In function 'ttm_prot_from_caching': /kisskb/src/drivers/gpu/drm/ttm/ttm_module.c:71:24: error: 'struct cpuinfo_um' has no member named 'x86' else if (boot_cpu_data.x86 > 3) ^ make[5]: *** [/kisskb/src/scripts/Makefile.build:287: drivers/gpu/drm/ttm/ttm_module.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/gpu/drm/ttm] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/gpu/drm] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/gpu] Error 2 /kisskb/src/drivers/scsi/aic7xxx/aic7xxx_osm.c: In function 'ahc_platform_free': /kisskb/src/drivers/scsi/aic7xxx/aic7xxx_osm.c:1231:12: error: passing argument 1 of 'iounmap' discards 'volatile' qualifier from pointer target type [-Werror=discarded-qualifiers] iounmap(ahc->bsh.maddr); ^ In file included from /kisskb/src/arch/um/include/asm/io.h:7:0, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/um/include/asm/hardirq.h:5, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/highmem.h:10, from /kisskb/src/include/linux/bvec.h:10, from /kisskb/src/include/linux/blk_types.h:10, from /kisskb/src/include/linux/genhd.h:16, from /kisskb/src/include/linux/blkdev.h:6, from /kisskb/src/drivers/scsi/aic7xxx/aic7xxx_osm.h:63, from /kisskb/src/drivers/scsi/aic7xxx/aic7xxx_osm.c:123: /kisskb/src/include/asm-generic/logic_io.h:36:17: note: expected 'void *' but argument is of type 'volatile uint8_t * {aka volatile unsigned char *}' #define iounmap iounmap ^ /kisskb/src/include/asm-generic/logic_io.h:37:6: note: in expansion of macro 'iounmap' void iounmap(void __iomem *addr); ^ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:287: drivers/scsi/aic7xxx/aic7xxx_osm.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/scsi/aic7xxx] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/scsi] Error 2 /kisskb/src/drivers/net/ethernet/dec/tulip/winbond-840.c:323:13: error: conflicting types for 'init_registers' static void init_registers(struct net_device *dev); ^ In file included from /kisskb/src/arch/um/include/asm/processor-generic.h:14:0, from /kisskb/src/arch/x86/um/asm/processor.h:41, from /kisskb/src/include/linux/spinlock_up.h:8, from /kisskb/src/include/linux/spinlock.h:95, from /kisskb/src/include/linux/mm_types.h:9, from /kisskb/src/include/linux/buildid.h:5, from /kisskb/src/include/linux/module.h:14, from /kisskb/src/drivers/net/ethernet/dec/tulip/winbond-840.c:110: /kisskb/src/arch/um/include/shared/registers.h:20:12: note: previous declaration of 'init_registers' was here extern int init_registers(int pid); ^ make[6]: *** [/kisskb/src/scripts/Makefile.build:287: drivers/net/ethernet/dec/tulip/winbond-840.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/net/ethernet/dec/tulip] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/net/ethernet/dec] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/net/ethernet] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:549: drivers/net] Error 2 make[1]: *** [/kisskb/src/Makefile:1846: drivers] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 48 ARCH=um O=/kisskb/build/linus_um-allmodconfig_um-x86_64 CROSS_COMPILE=/opt/cross/kisskb/fe-x86-64-core-i7-2017.05/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_um-allmodconfig_um-x86_64 # Build took: 0:07:50.180313