Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54c0a4b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (incoming from Andrew) 

Merge misc updates from Andrew Morton:

 - a few hotfixes

 - dynamic-debug updates

 - ipc updates

 - various other sweepings off the factory floor

* akpm: (31 commits)
  firmware/google: drop 'select EFI' to avoid recursive dependency
  compat: fix sys_fanotify_mark
  checkpatch.pl: check for function declarations without arguments
  mm/migrate.c: fix setting of cpupid on page migration twice against normal page
  softirq: use const char * const for softirq_to_name, whitespace neatening
  softirq: convert printks to pr_<level>
  softirq: use ffs() in __do_softirq()
  kernel/kexec.c: use vscnprintf() instead of vsnprintf() in vmcoreinfo_append_str()
  splice: fix unexpected size truncation
  ipc: fix compat msgrcv with negative msgtyp
  ipc,msg: document barriers
  ipc: delete seq_max field in struct ipc_ids
  ipc: simplify sysvipc_proc_open() return
  ipc: remove useless return statement
  ipc: remove braces for single statements
  ipc: standardize code comments
  ipc: whitespace cleanup
  ipc: change kern_ipc_perm.deleted type to bool
  ipc: introduce ipc_valid_object() helper to sort out IPC_RMID races
  ipc/sem.c: avoid overflow of semop undo (semadj) value
  ...
parents 1b17366d c2218e26

arch/arm/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ static void __init request_standard_resources(const struct machine_desc *mdesc) 
	kernel_data.end     = virt_to_phys(_end - 1);



	for_each_memblock(memory, region) {

		res = memblock_virt_alloc(sizeof(*res), 0);

		res = memblock_virt_alloc_low(sizeof(*res), 0);

		res->name  = "System RAM";

		res->start = __pfn_to_phys(memblock_region_memory_base_pfn(region));

		res->end = __pfn_to_phys(memblock_region_memory_end_pfn(region)) - 1;

arch/unicore32/kernel/early_printk.c

+1 −7
Original line number Diff line number Diff line
@@ -35,17 +35,11 @@ static struct console early_ocd_console = { 


static int __init setup_early_printk(char *buf)

{

	int keep_early;



	if (!buf || early_console)

		return 0;



	if (strstr(buf, "keep"))

		keep_early = 1;



	early_console = &early_ocd_console;



	if (keep_early)

	if (strstr(buf, "keep"))

		early_console->flags &= ~CON_BOOT;

	else

		early_console->flags |= CON_BOOT;

arch/x86/include/asm/page_types.h

+2 −2
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ extern int devmem_is_allowed(unsigned long pagenr); 
extern unsigned long max_low_pfn_mapped;

extern unsigned long max_pfn_mapped;



static inline phys_addr_t get_max_low_mapped(void)

static inline phys_addr_t get_max_mapped(void)

{

	return (phys_addr_t)max_low_pfn_mapped << PAGE_SHIFT;

	return (phys_addr_t)max_pfn_mapped << PAGE_SHIFT;

}



bool pfn_range_is_mapped(unsigned long start_pfn, unsigned long end_pfn);

arch/x86/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -1119,7 +1119,7 @@ void __init setup_arch(char **cmdline_p) 


	setup_real_mode();



	memblock_set_current_limit(get_max_low_mapped());

	memblock_set_current_limit(get_max_mapped());

	dma_contiguous_reserve(0);



	/*

drivers/firmware/google/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ menu "Google Firmware Drivers" 


config GOOGLE_SMI

	tristate "SMI interface for Google platforms"

	depends on ACPI && DMI

	select EFI

	depends on ACPI && DMI && EFI

	select EFI_VARS

	help

	  Say Y here if you want to enable SMI callbacks for Google