Commit 2ab99e54 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "Four patches.

  Subsystems affected by this patch series: mm/swap, kconfig, ocfs2, and
  selftests"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  selftests: vm: fix clang build error multiple output files
  ocfs2: fix crash when initialize filecheck kobj fails
  configs/debug: restore DEBUG_INFO=y for overriding
  mm: swap: get rid of livelock in swapin readahead
parents a46310bf 1c4debc4

fs/ocfs2/super.c

+11 −11
Original line number Diff line number Diff line
@@ -1105,17 +1105,6 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) 
		goto read_super_error;

	}



	root = d_make_root(inode);

	if (!root) {

		status = -ENOMEM;

		mlog_errno(status);

		goto read_super_error;

	}



	sb->s_root = root;



	ocfs2_complete_mount_recovery(osb);



	osb->osb_dev_kset = kset_create_and_add(sb->s_id, NULL,

						&ocfs2_kset->kobj);

	if (!osb->osb_dev_kset) {
@@ -1133,6 +1122,17 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) 
		goto read_super_error;

	}



	root = d_make_root(inode);

	if (!root) {

		status = -ENOMEM;

		mlog_errno(status);

		goto read_super_error;

	}



	sb->s_root = root;



	ocfs2_complete_mount_recovery(osb);



	if (ocfs2_mount_local(osb))

		snprintf(nodestr, sizeof(nodestr), "local");

	else

kernel/configs/debug.config

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ CONFIG_SYMBOLIC_ERRNAME=y 
#

# Compile-time checks and compiler options

#

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y

CONFIG_DEBUG_SECTION_MISMATCH=y

CONFIG_FRAME_WARN=2048

mm/swap_state.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, 
		 * __read_swap_cache_async(), which has set SWAP_HAS_CACHE

		 * in swap_map, but not yet added its page to swap cache.

		 */

		cond_resched();

		schedule_timeout_uninterruptible(1);

	}



	/*

tools/testing/selftests/vm/Makefile

+2 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# Makefile for vm selftests



LOCAL_HDRS += $(selfdir)/vm/local_config.h $(top_srcdir)/mm/gup_test.h



include local_config.mk



uname_M := $(shell uname -m 2>/dev/null || echo not)
@@ -140,10 +142,6 @@ endif 


$(OUTPUT)/mlock-random-test $(OUTPUT)/memfd_secret: LDLIBS += -lcap



$(OUTPUT)/gup_test: ../../../../mm/gup_test.h



$(OUTPUT)/hmm-tests: local_config.h



# HMM_EXTRA_LIBS may get set in local_config.mk, or it may be left empty.

$(OUTPUT)/hmm-tests: LDLIBS += $(HMM_EXTRA_LIBS)