Lines Matching +full:dir +full:- +full:885 +full:l
1 diff --git a/Makefile b/Makefile
3 --- a/Makefile
5 @@ -1236,9 +1236,15 @@ include/config/kernel.release: FORCE
9 -scripts: scripts_basic scripts_dtc
21 # A multi level approach is used. prepareN is processed before prepareN-1.
22 @@ -1388,12 +1394,18 @@ kselftest-merge:
33 +$(shell mkdir -p $(objdtstree))
36 - $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
42 diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
44 --- a/fs/ubifs/recovery.c
46 @@ -662,10 +662,43 @@ struct ubifs_scan_leb *ubifs_recover_leb(struct ubifs_info *c, int lnum,
49 len -= ret;
50 - } else if (ret == SCANNED_EMPTY_SPACE ||
51 - ret == SCANNED_GARBAGE ||
52 - ret == SCANNED_A_BAD_PAD_NODE ||
53 - ret == SCANNED_A_CORRUPT_NODE) {
57 + if (ubifs_check_node(c, buf, len, lnum, offs, 1, 1) == -EUCLEAN &&
65 + * in the low-voltage operation process, and the last data
69 + skip = ALIGN(offs + le32_to_cpu(ch->len), c->max_write_size) - offs;
70 + memset(buf + skip, 0xff, len - skip);
81 + * page written by the flash in the low-voltage operation process,
94 diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
96 --- a/fs/xfs/xfs_inode.c
98 @@ -802,7 +802,6 @@ xfs_ialloc(
102 - struct inode *dir = pip ? VFS_I(pip) : NULL;
103 struct xfs_mount *mp = tp->t_mountp;
106 @@ -848,17 +847,18 @@ xfs_ialloc(
110 + inode->i_mode = mode;
112 + inode->i_uid = current_fsuid();
113 inode->i_rdev = rdev;
114 ip->i_d.di_projid = prid;
116 - if (dir && !(dir->i_mode & S_ISGID) &&
117 - (mp->m_flags & XFS_MOUNT_GRPID)) {
118 - inode->i_uid = current_fsuid();
119 - inode->i_gid = dir->i_gid;
120 - inode->i_mode = mode;
122 + inode->i_gid = VFS_I(pip)->i_gid;
123 + if ((VFS_I(pip)->i_mode & S_ISGID) && S_ISDIR(mode))
124 + inode->i_mode |= S_ISGID;
126 - inode_init_owner(inode, dir, mode);
127 + inode->i_gid = current_fsgid();
131 diff --git a/init/Kconfig b/init/Kconfig
133 --- a/init/Kconfig
135 @@ -1348,6 +1348,12 @@ if BLK_DEV_INITRD
148 diff --git a/init/initramfs.c b/init/initramfs.c
150 --- a/init/initramfs.c
152 @@ -12,6 +12,7 @@
160 @@ -465,6 +466,9 @@ static char * __init unpack_to_rootfs(char *buf, unsigned long len)
170 @@ -639,4 +643,23 @@ static int __init populate_rootfs(void)
194 diff --git a/init/main.c b/init/main.c
195 index e8d5c6477..885ce026d 100644
196 --- a/init/main.c
198 @@ -1533,6 +1533,10 @@ static noinline void __init kernel_init_freeable(void)
209 @@ -1542,6 +1546,10 @@ static noinline void __init kernel_init_freeable(void)
220 diff --git a/ipc/msg.c b/ipc/msg.c
222 --- a/ipc/msg.c
224 @@ -147,7 +147,7 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params)
225 key_t key = params->key;
226 int msgflg = params->flg;
228 - msq = kvmalloc(sizeof(*msq), GFP_KERNEL_ACCOUNT);
231 return -ENOMEM;
233 diff --git a/ipc/sem.c b/ipc/sem.c
235 --- a/ipc/sem.c
237 @@ -511,7 +511,7 @@ static struct sem_array *sem_alloc(size_t nsems)
238 if (nsems > (INT_MAX - sizeof(*sma)) / sizeof(sma->sems[0]))
241 - sma = kvzalloc(struct_size(sma, sems, nsems), GFP_KERNEL_ACCOUNT);
246 @@ -1852,7 +1852,7 @@ static inline int get_undo_list(struct sem_undo_list **undo_listp)
248 undo_list = current->sysvsem.undo_list;
250 - undo_list = kzalloc(sizeof(*undo_list), GFP_KERNEL_ACCOUNT);
253 return -ENOMEM;
254 spin_lock_init(&undo_list->lock);
255 @@ -1937,7 +1937,7 @@ static struct sem_undo *find_alloc_undo(struct ipc_namespace *ns, int semid)
259 - new = kzalloc(sizeof(struct sem_undo) + sizeof(short)*nsems, GFP_KERNEL_ACCOUNT);
262 ipc_rcu_putref(&sma->sem_perm, sem_rcu_free);
263 return ERR_PTR(-ENOMEM);
264 diff --git a/ipc/shm.c b/ipc/shm.c
266 --- a/ipc/shm.c
268 @@ -711,7 +711,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
269 ns->shm_tot + numpages > ns->shm_ctlall)
270 return -ENOSPC;
272 - shp = kvmalloc(sizeof(*shp), GFP_KERNEL_ACCOUNT);
275 return -ENOMEM;
277 diff --git a/ipc/util.c b/ipc/util.c
279 --- a/ipc/util.c
281 @@ -754,13 +754,21 @@ struct pid_namespace *ipc_seq_pid_ns(struct seq_file *s)
285 - struct kern_ipc_perm *ipc = NULL;
286 - int max_idx = ipc_get_maxidx(ids);
291 + for (id = 0; id < pos && total < ids->in_use; id++) {
292 + ipc = idr_find(&ids->ipcs_idr, id);
297 - if (max_idx == -1 || pos > max_idx)
299 + if (total >= ids->in_use)
302 - for (; pos <= max_idx; pos++) {
304 ipc = idr_find(&ids->ipcs_idr, pos);
307 diff --git a/make-boot.sh b/make-boot.sh
310 --- /dev/null
311 +++ b/make-boot.sh
312 @@ -0,0 +1,33 @@
315 +set -e
319 +BOOT_LINUX=${root_out_dir}/kernel/src_tmp/linux-5.10
333 + if [ "`uname -m`" == "aarch64" ]; then
334 + echo y | sudo mke2fs -b ${block_size} -d boot_linux -i 8192 -t ext2 boot_linux.img…
336 + genext2fs -B ${blocks} -b ${block_size} -d boot_linux -i 8192 -U boot_linux.img
344 +cd -
346 diff --git a/make-ohos.sh b/make-ohos.sh
349 --- /dev/null
350 +++ b/make-ohos.sh
351 @@ -0,0 +1,139 @@
354 +set -e
360 +export PATH=${real_path%out*}prebuilts/clang/ohos/linux-x86_64/llvm/bin/:$PATH
361 +export KBUILD_OUTPUT=${real_path%out*}/out/kernel/OBJ/linux-5.10
365 +CPUs=`sed -n "N;/processor/p" /proc/cpuinfo|wc -l`
366 …LE=../../../../prebuilts/gcc/linux-x86/aarch64/gcc-linaro-7.5.0-2019.12-x86_64_aarch64-linux-gnu/b…
385 + "TB-RK3568X0 arm64 0xfe660000 rk3568-toybrick-x0-linux Image rockchip_linux_defconfig"
386 + "sapphire-rk3399 arm64 0xff1a0000 rk3399-sapphire-excavator-linux Image rockchip_linux_defconfig"
387 + "sapphire-rk3399T arm64 0xff1a0000 rk3399-sapphire-excavator-linux-3399t Image rockchip_linux_de…
393 + echo "Usage: ./make-ohos.sh {BOARD_NAME} KBUILD_OUTPUT=../../OBJ/linux-5.10"
396 + echo " ./make-ohos.sh $(echo $i | awk '{print $1}') KBUILD_OUTPUT=../../OBJ/linux-5.10"
407 + echo "label rockchip-kernel-5.10" > ${EXTLINUX_CONF}
410 + cmdline="append earlycon=uart8250,mmio32,${uart} root=PARTUUID=614e0000-0000-4b53-8000-1d28000054…
421 + if [ $? -ne 0 ]; then
423 + return -1
426 + ${MAKE} ARCH=${arch} ${dtb}.img -j${CPUs}
427 + if [ $? -ne 0 ]; then
429 + return -2
440 + if [ "`uname -m`" == "aarch64" ]; then
441 + echo y | sudo mke2fs -b ${block_size} -d boot_linux -i 8192 -t ext2 boot_linux.img ${blocks}
443 + genext2fs -B ${blocks} -b ${block_size} -d boot_linux -i 8192 -U boot_linux.img
462 + rm -rf ${BUILD_PATH}
463 + mkdir -p ${EXTLINUX_PATH}
466 + if [ $? -ne 0 ]; then
470 + cp -f ${OBJ_PATH}arch/${arch}/boot/${image} ${EXTLINUX_PATH}/
471 + cp -f ${OBJ_PATH}${dtb_path}/${dtb}.dtb ${EXTLINUX_PATH}/${SAPPHIRE_DTB}
472 + cp -f logo*.bmp ${BUILD_PATH}/
480 +cp -arf ${MCU_LIB_FILE} ${MCU_OBJ_PATCH}/
488 +if [ ${found} -eq 0 ]; then
491 diff --git a/mm/hugetlb.c b/mm/hugetlb.c
493 --- a/mm/hugetlb.c
495 @@ -3932,7 +3932,6 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vm…
499 - bool force_flush = false;
503 @@ -3961,8 +3960,10 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *v…
507 - tlb_flush_pmd_range(tlb, address & PUD_MASK, PUD_SIZE);
508 - force_flush = true;
516 @@ -4019,22 +4020,6 @@ void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *v…
520 -
521 - /*
522 - * If we unshared PMDs, the TLB flush was not recorded in mmu_gather. We
523 - * could defer the flush until now, since by holding i_mmap_rwsem we
524 - * guaranteed that the last refernece would not be dropped. But we must
525 - * do the flushing before we return, as otherwise i_mmap_rwsem will be
526 - * dropped and the last reference to the shared PMDs page might be
527 - * dropped as well.
528 - *
529 - * In theory we could defer the freeing of the PMD pages as well, but
530 - * huge_pmd_unshare() relies on the exact page_count for the PMD page to
531 - * detect sharing, so we cannot defer the release of the page either.
532 - * Instead, do flush now.
533 - */
534 - if (force_flush)
535 - tlb_flush_mmu_tlbonly(tlb);
539 diff --git a/mm/memblock.c b/mm/memblock.c
541 --- a/mm/memblock.c
543 @@ -97,6 +97,26 @@ struct pglist_data __refdata contig_page_data;
570 @@ -1907,6 +1927,28 @@ static void __init __free_pages_memory(unsigned long start, unsigned long en…
584 + totalram_pages_add(defer_end - defer_start);
586 + pr_info("%s: size %luM free %luM [%luM - %luM] total %luM\n", __func__,
588 + (defer_end - defer_start) >> (20 - PAGE_SHIFT),
589 + defer_end >> (20 - PAGE_SHIFT),
590 + defer_start >> (20 - PAGE_SHIFT),
591 + totalram_pages() >> (20 - PAGE_SHIFT));
599 @@ -1917,6 +1959,15 @@ static unsigned long __init __free_memory_core(phys_addr_t start,
604 + if ((end - start) > defer_free_block_size) {
614 return end_pfn - start_pfn;
615 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
617 --- a/mm/page_alloc.c
619 @@ -1445,9 +1445,15 @@ static void free_one_page(struct zone *zone,
623 - unsigned long zone, int nid)
636 @@ -1480,7 +1486,7 @@ static void __meminit init_reserved_page(unsigned long pfn)
637 if (pfn >= zone->zone_start_pfn && pfn < zone_end_pfn(zone))
640 - __init_single_page(pfn_to_page(pfn), pfn, zid, nid);
645 @@ -1794,7 +1800,7 @@ static unsigned long __init deferred_init_pages(struct zone *zone,
649 - __init_single_page(page, pfn, zid, nid);
654 @@ -6169,6 +6175,11 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long z…
665 * There can be holes in boot-time mem_map[]s handed to this
666 @@ -6182,7 +6193,7 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zo…
670 - __init_single_page(page, pfn, zone, nid);
675 @@ -6228,7 +6239,7 @@ void __ref memmap_init_zone_device(struct zone *zone,
679 - __init_single_page(page, pfn, zone_idx, nid);
684 @@ -6313,7 +6324,7 @@ static void __init init_unavailable_range(unsigned long spfn,
685 + pageblock_nr_pages - 1;
688 - __init_single_page(pfn_to_page(pfn), pfn, zone, node);
693 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
695 --- a/scripts/Makefile.lib
697 @@ -318,8 +318,9 @@ $(obj)/%.dtb.S: $(obj)/%.dtb FORCE
701 -cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
702 - $(DTC) -O $(patsubst .%,%,$(suffix $@)) -o $@ -b 0 \
703 +cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
704 + $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
705 + $(DTC) -O dtb -o $@ -b 0 \
706 $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
707 -d $(depfile).dtc.tmp $(dtc-tmp) ; \
709 diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c
711 --- a/scripts/dtc/checks.c
713 @@ -649,6 +649,24 @@ static void fixup_omit_unused_nodes(struct check *c, struct dt_info *dti,
715 if (node->omit_if_unused && !node->is_referenced)
718 + if (node->deleted) {
719 + struct node *parent = node->parent;
724 + for_each_label(parent->labels, label)
738 diff --git a/security/Kconfig.hardening b/security/Kconfig.hardening
740 --- a/security/Kconfig.hardening
742 @@ -39,7 +39,7 @@ choice
746 - default INIT_STACK_NONE
751 @@ -211,6 +211,7 @@ config STACKLEAK_RUNTIME_DISABLE
759 diff --git a/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c b/tools/usb/ffs-aio-exa…
761 --- a/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c
762 +++ b/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c
763 @@ -57,16 +57,30 @@ static const struct {
788 - FUNCTIONFS_HAS_HS_DESC),
795 @@ -115,6 +129,58 @@ static const struct {
854 diff --git a/tools/usb/ffs-aio-example/simple/device_app/aio_simple.c b/tools/usb/ffs-aio-example/s…
856 --- a/tools/usb/ffs-aio-example/simple/device_app/aio_simple.c
857 +++ b/tools/usb/ffs-aio-example/simple/device_app/aio_simple.c
858 @@ -55,16 +55,30 @@ static const struct {
883 - FUNCTIONFS_HAS_HS_DESC),
890 @@ -113,6 +127,58 @@ static const struct {