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

Commit c6a1ede6 authored by Luca Weiss's avatar Luca Weiss
Browse files

Merge remote-tracking branch 'aosp/android-4.9-q' into int/11/fp3 

Linux 4.9.303

Change-Id: I6a811423f6c0ea0fe21b97a704d8f3f8292f7dc8
parents fb1b1876 59a9798e

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 302

SUBLEVEL = 303

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/kernel/vdso.c

+0 −1
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ static int __init vdso_init(void) 
	}



	text_pages = (vdso_end - vdso_start) >> PAGE_SHIFT;

	pr_debug("vdso: %i text pages at base %p\n", text_pages, vdso_start);



	/* Allocate the VDSO text pagelist */

	vdso_text_pagelist = kcalloc(text_pages, sizeof(struct page *),

arch/arm64/kernel/vdso.c

+0 −2
Original line number Diff line number Diff line
@@ -131,8 +131,6 @@ static int __init vdso_init(void) 
	}



	vdso_pages = (vdso_end - vdso_start) >> PAGE_SHIFT;

	pr_info("vdso: %ld pages (%ld code @ %p, %ld data @ %p)\n",

		vdso_pages + 1, vdso_pages, vdso_start, 1L, vdso_data);



	/* Allocate the vDSO pagelist, plus a page for the data. */

	vdso_pagelist = kcalloc(vdso_pages + 1, sizeof(struct page *),

arch/parisc/kernel/drivers.c

+1 −1
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ static void print_parisc_device(struct parisc_device *dev) 
	static int count;



	print_pa_hwpath(dev, hw_path);

	printk(KERN_INFO "%d. %s at 0x%p [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",

	printk(KERN_INFO "%d. %s at 0x%px [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }",

		++count, dev->name, (void*) dev->hpa.start, hw_path, dev->id.hw_type,

		dev->id.hversion_rev, dev->id.hversion, dev->id.sversion);

arch/parisc/mm/init.c

+5 −5
Original line number Diff line number Diff line
@@ -623,11 +623,11 @@ void __init mem_init(void) 
	mem_init_print_info(NULL);

#ifdef CONFIG_DEBUG_KERNEL /* double-sanity-check paranoia */

	printk("virtual kernel memory layout:\n"

	       "    vmalloc : 0x%p - 0x%p   (%4ld MB)\n"

	       "    memory  : 0x%p - 0x%p   (%4ld MB)\n"

	       "      .init : 0x%p - 0x%p   (%4ld kB)\n"

	       "      .data : 0x%p - 0x%p   (%4ld kB)\n"

	       "      .text : 0x%p - 0x%p   (%4ld kB)\n",

	       "    vmalloc : 0x%px - 0x%px   (%4ld MB)\n"

	       "    memory  : 0x%px - 0x%px   (%4ld MB)\n"

	       "      .init : 0x%px - 0x%px   (%4ld kB)\n"

	       "      .data : 0x%px - 0x%px   (%4ld kB)\n"

	       "      .text : 0x%px - 0x%px   (%4ld kB)\n",



	       (void*)VMALLOC_START, (void*)VMALLOC_END,

	       (VMALLOC_END - VMALLOC_START) >> 20,