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

Commit 88a4eb86 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4cb39295 ("MIPS: cpuinfo: Fix a warning for... 


Merge 4cb39295 ("MIPS: cpuinfo: Fix a warning for CONFIG_CPUMASK_OFFSTACK") into android-mainline

Steps on the way to 4.19.256

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I8f23ebdd881ffbdcbdec5e6b76df7fe834479f4b
parents 0d7ce004 4cb39295

Makefile

+3 −0
Original line number Diff line number Diff line
@@ -969,6 +969,9 @@ LDFLAGS_BUILD_ID := $(call ld-option, --build-id) 
KBUILD_LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID)

LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID)



KBUILD_LDFLAGS	+= -z noexecstack

KBUILD_LDFLAGS	+= $(call ld-option,--no-warn-rwx-segments)



ifeq ($(CONFIG_STRIP_ASM_SYMS),y)

LDFLAGS_vmlinux	+= $(call ld-option, -X,)

endif

arch/ia64/include/asm/processor.h

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ ia64_get_irr(unsigned int vector) 
{

	unsigned int reg = vector / 64;

	unsigned int bit = vector % 64;

	u64 irr;

	unsigned long irr;



	switch (reg) {

	case 0: irr = ia64_getreg(_IA64_REG_CR_IRR0); break;

arch/mips/kernel/proc.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static void *c_start(struct seq_file *m, loff_t *pos) 
{

	unsigned long i = *pos;



	return i < NR_CPUS ? (void *) (i + 1) : NULL;

	return i < nr_cpu_ids ? (void *) (i + 1) : NULL;

}



static void *c_next(struct seq_file *m, void *v, loff_t *pos)

arch/parisc/kernel/drivers.c

+4 −5
Original line number Diff line number Diff line
@@ -499,7 +499,6 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path) 
	dev->id.hversion_rev = iodc_data[1] & 0x0f;

	dev->id.sversion = ((iodc_data[4] & 0x0f) << 16) |

			(iodc_data[5] << 8) | iodc_data[6];

	dev->hpa.name = parisc_pathname(dev);

	dev->hpa.start = hpa;

	/* This is awkward.  The STI spec says that gfx devices may occupy

	 * 32MB or 64MB.  Unfortunately, we don't know how to tell whether
@@ -513,10 +512,10 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path) 
		dev->hpa.end = hpa + 0xfff;

	}

	dev->hpa.flags = IORESOURCE_MEM;

	name = parisc_hardware_description(&dev->id);

	if (name) {

		strlcpy(dev->name, name, sizeof(dev->name));

	}

	dev->hpa.name = dev->name;

	name = parisc_hardware_description(&dev->id) ? : "unknown";

	snprintf(dev->name, sizeof(dev->name), "%s [%s]",

		name, parisc_pathname(dev));



	/* Silently fail things like mouse ports which are subsumed within

	 * the keyboard controller

arch/powerpc/platforms/powernv/rng.c

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ int powernv_get_random_real_mode(unsigned long *v) 
	struct powernv_rng *rng;



	rng = raw_cpu_read(powernv_rng);

	if (!rng)

		return 0;



	*v = rng_whiten(rng, __raw_rm_readq(rng->regs_real));