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

Commit 46838cf1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.9.91 (bb94f9d8) into msm-4.9"

parents 78667ded 6c02278d

Documentation/ABI/testing/sysfs-bus-iio

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ Description: 
		Description of the physical chip / device for device X.

		Description of the physical chip / device for device X.

		Typically a part number.

		Typically a part number.





What:		/sys/bus/iio/devices/iio:deviceX/timestamp_clock

What:		/sys/bus/iio/devices/iio:deviceX/current_timestamp_clock

KernelVersion:	4.5

KernelVersion:	4.5

Contact:	linux-iio@vger.kernel.org

Contact:	linux-iio@vger.kernel.org

Description:

Description:

Makefile

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

VERSION = 4

PATCHLEVEL = 9

PATCHLEVEL = 9

SUBLEVEL = 90

SUBLEVEL = 91

EXTRAVERSION =

EXTRAVERSION =

NAME = Roaring Lionus

NAME = Roaring Lionus
@@ -870,6 +870,15 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign) 
# disable invalid "can't wrap" optimizations for signed / pointers

# disable invalid "can't wrap" optimizations for signed / pointers

KBUILD_CFLAGS	+= $(call cc-option,-fno-strict-overflow)

KBUILD_CFLAGS	+= $(call cc-option,-fno-strict-overflow)





# clang sets -fmerge-all-constants by default as optimization, but this

# is non-conforming behavior for C and in fact breaks the kernel, so we

# need to disable it here generally.

KBUILD_CFLAGS	+= $(call cc-option,-fno-merge-all-constants)



# for gcc -fno-merge-all-constants disables everything, but it is fine

# to have actual conforming behavior enabled.

KBUILD_CFLAGS	+= $(call cc-option,-fmerge-constants)



# Make sure -fstack-check isn't enabled (like gentoo apparently did)

# Make sure -fstack-check isn't enabled (like gentoo apparently did)

KBUILD_CFLAGS  += $(call cc-option,-fno-stack-check,)

KBUILD_CFLAGS  += $(call cc-option,-fno-stack-check,)

arch/arm64/mm/mmu.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -861,3 +861,13 @@ int pmd_clear_huge(pmd_t *pmd) 
	pmd_clear(pmd);

	pmd_clear(pmd);

	return 1;

	return 1;

}

}



int pud_free_pmd_page(pud_t *pud)

{

	return pud_none(*pud);

}



int pmd_free_pte_page(pmd_t *pmd)

{

	return pmd_none(*pmd);

}

arch/mips/ralink/reset.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -96,16 +96,9 @@ static void ralink_restart(char *command) 
	unreachable();

	unreachable();

}

}





static void ralink_halt(void)

{

	local_irq_disable();

	unreachable();

}



static int __init mips_reboot_setup(void)

static int __init mips_reboot_setup(void)

{

{

	_machine_restart = ralink_restart;

	_machine_restart = ralink_restart;

	_machine_halt = ralink_halt;





	return 0;

	return 0;

}

}

arch/x86/Makefile

+9 −0
Original line number Original line Diff line number Diff line
@@ -193,6 +193,15 @@ KBUILD_CFLAGS += $(cfi) $(cfi-sigframe) $(cfi-sections) $(asinstr) $(avx_instr) 




LDFLAGS := -m elf_$(UTS_MACHINE)

LDFLAGS := -m elf_$(UTS_MACHINE)





#

# The 64-bit kernel must be aligned to 2MB.  Pass -z max-page-size=0x200000 to

# the linker to force 2MB page size regardless of the default page size used

# by the linker.

#

ifdef CONFIG_X86_64

LDFLAGS += $(call ld-option, -z max-page-size=0x200000)

endif



# Speed up the build

# Speed up the build

KBUILD_CFLAGS += -pipe

KBUILD_CFLAGS += -pipe

# Workaround for a gcc prelease that unfortunately was shipped in a suse release

# Workaround for a gcc prelease that unfortunately was shipped in a suse release