Commit fdb5d6ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "12 patches.

  Subsystems affected by this patch series: mm (documentation, kasan,
  and pagemap), csky, ia64, gcov, and lib"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  lib: remove "expecting prototype" kernel-doc warnings
  gcov: clang: fix clang-11+ build
  mm: ptdump: fix build failure
  mm/mapping_dirty_helpers: guard hugepage pud's usage
  ia64: tools: remove duplicate definition of ia64_mf() on ia64
  ia64: tools: remove inclusion of ia64-specific version of errno.h header
  ia64: fix discontig.c section mismatches
  ia64: remove duplicate entries in generic_defconfig
  csky: change a Kconfig symbol name to fix e1000 build error
  kasan: remove redundant config option
  kasan: fix hwasan build for gcc
  mm: eliminate "expecting prototype" kernel-doc warnings
parents 9cdbf646 c95c2d32

arch/arm64/kernel/sleep.S

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ SYM_FUNC_START(_cpu_resume) 
	 */

	bl	cpu_do_resume



#if defined(CONFIG_KASAN) && CONFIG_KASAN_STACK

#if defined(CONFIG_KASAN) && defined(CONFIG_KASAN_STACK)

	mov	x0, sp

	bl	kasan_unpoison_task_stack_below

#endif

arch/csky/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ config FORCE_MAX_ZONEORDER 
	int "Maximum zone order"

	default "11"



config RAM_BASE

config DRAM_BASE

	hex "DRAM start addr (the same with memory-section in dts)"

	default 0x0

arch/csky/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#define SSEG_SIZE	0x20000000

#define LOWMEM_LIMIT	(SSEG_SIZE * 2)



#define PHYS_OFFSET_OFFSET (CONFIG_RAM_BASE & (SSEG_SIZE - 1))

#define PHYS_OFFSET_OFFSET (CONFIG_DRAM_BASE & (SSEG_SIZE - 1))



#ifndef __ASSEMBLY__

arch/ia64/configs/generic_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ CONFIG_CHR_DEV_SG=m 
CONFIG_SCSI_FC_ATTRS=y

CONFIG_SCSI_SYM53C8XX_2=y

CONFIG_SCSI_QLOGIC_1280=y

CONFIG_ATA=y

CONFIG_ATA_PIIX=y

CONFIG_SATA_VITESSE=y

CONFIG_MD=y

CONFIG_BLK_DEV_MD=m

arch/ia64/mm/discontig.c

+3 −3
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static int __init build_node_maps(unsigned long start, unsigned long len, 
 * acpi_boot_init() (which builds the node_to_cpu_mask array) hasn't been

 * called yet.  Note that node 0 will also count all non-existent cpus.

 */

static int __meminit early_nr_cpus_node(int node)

static int early_nr_cpus_node(int node)

{

	int cpu, n = 0;
@@ -110,7 +110,7 @@ static int __meminit early_nr_cpus_node(int node) 
 * compute_pernodesize - compute size of pernode data

 * @node: the node id.

 */

static unsigned long __meminit compute_pernodesize(int node)

static unsigned long compute_pernodesize(int node)

{

	unsigned long pernodesize = 0, cpus;
@@ -367,7 +367,7 @@ static void __init reserve_pernode_space(void) 
	}

}



static void __meminit scatter_node_data(void)

static void scatter_node_data(void)

{

	pg_data_t **dst;

	int node;