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

Commit 09f6247a authored by Dmitry Shmidt's avatar Dmitry Shmidt
Browse files

Merge tag 'v4.4.23' into android-4.4.y 

This is the 4.4.23 stable release
parents 8760f8e3 d19e48fe

Makefile

+20 −5
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 22

SUBLEVEL = 23

EXTRAVERSION =

NAME = Blurry Fish Butt
@@ -128,6 +128,10 @@ _all: 
# Cancel implicit rules on top Makefile

$(CURDIR)/Makefile Makefile: ;



ifneq ($(words $(subst :, ,$(CURDIR))), 1)

  $(error main directory cannot contain spaces nor colons)

endif



ifneq ($(KBUILD_OUTPUT),)

# Invoke a second make in the output directory, passing relevant variables

# check that the output directory actually exists
@@ -495,6 +499,12 @@ ifeq ($(KBUILD_EXTMOD),) 
                endif

        endif

endif

# install and module_install need also be processed one by one

ifneq ($(filter install,$(MAKECMDGOALS)),)

        ifneq ($(filter modules_install,$(MAKECMDGOALS)),)

	        mixed-targets := 1

        endif

endif



ifeq ($(mixed-targets),1)

# ===========================================================================
@@ -606,12 +616,17 @@ ARCH_CFLAGS := 
include arch/$(SRCARCH)/Makefile



KBUILD_CFLAGS	+= $(call cc-option,-fno-delete-null-pointer-checks,)

KBUILD_CFLAGS	+= $(call cc-disable-warning,maybe-uninitialized,)



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= -Os $(call cc-disable-warning,maybe-uninitialized,)

KBUILD_CFLAGS	+= -Os

else

ifdef CONFIG_PROFILE_ALL_BRANCHES

KBUILD_CFLAGS	+= -O2

else

KBUILD_CFLAGS   += -O2

endif

endif



# Tell gcc to never replace conditional load with a non-conditional one

KBUILD_CFLAGS	+= $(call cc-option,--param=allow-store-data-races=0)
@@ -1260,7 +1275,7 @@ help: 
	@echo  '  firmware_install- Install all firmware to INSTALL_FW_PATH'

	@echo  '                    (default: $$(INSTALL_MOD_PATH)/lib/firmware)'

	@echo  '  dir/            - Build all files in dir and below'

	@echo  '  dir/file.[oisS] - Build specified target only'

	@echo  '  dir/file.[ois]  - Build specified target only'

	@echo  '  dir/file.lst    - Build specified mixed source/assembly target only'

	@echo  '                    (requires a recent binutils and recent build (System.map))'

	@echo  '  dir/file.ko     - Build module including final link'
@@ -1500,11 +1515,11 @@ image_name: 
# Clear a bunch of variables before executing the submake

tools/: FORCE

	$(Q)mkdir -p $(objtree)/tools

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(O) subdir=tools -C $(src)/tools/

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/



tools/%: FORCE

	$(Q)mkdir -p $(objtree)/tools

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(O) subdir=tools -C $(src)/tools/ $*

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/ $*



# Single targets

# ---------------------------------------------------------------------------

arch/arm/crypto/aes-ce-glue.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int ctr_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst, 
		err = blkcipher_walk_done(desc, &walk,

					  walk.nbytes % AES_BLOCK_SIZE);

	}

	if (nbytes) {

	if (walk.nbytes % AES_BLOCK_SIZE) {

		u8 *tdst = walk.dst.virt.addr + blocks * AES_BLOCK_SIZE;

		u8 *tsrc = walk.src.virt.addr + blocks * AES_BLOCK_SIZE;

		u8 __aligned(8) tail[AES_BLOCK_SIZE];

arch/arm/mach-pxa/idp.c

+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ static struct resource smc91x_resources[] = { 
};



static struct smc91x_platdata smc91x_platdata = {

	.flags = SMC91X_USE_32BIT | SMC91X_USE_DMA | SMC91X_NOWAIT,

	.flags = SMC91X_USE_8BIT | SMC91X_USE_16BIT | SMC91X_USE_32BIT |

		 SMC91X_USE_DMA | SMC91X_NOWAIT,

};



static struct platform_device smc91x_device = {

arch/arm/mach-pxa/xcep.c

+2 −1
Original line number Diff line number Diff line
@@ -120,7 +120,8 @@ static struct resource smc91x_resources[] = { 
};



static struct smc91x_platdata xcep_smc91x_info = {

	.flags	= SMC91X_USE_32BIT | SMC91X_NOWAIT | SMC91X_USE_DMA,

	.flags	= SMC91X_USE_8BIT | SMC91X_USE_16BIT | SMC91X_USE_32BIT |

		  SMC91X_NOWAIT | SMC91X_USE_DMA,

};



static struct platform_device smc91x_device = {

arch/arm/mach-realview/core.c

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ static struct smsc911x_platform_config smsc911x_config = { 
};



static struct smc91x_platdata smc91x_platdata = {

	.flags = SMC91X_USE_32BIT | SMC91X_NOWAIT,

	.flags = SMC91X_USE_8BIT | SMC91X_USE_16BIT | SMC91X_USE_32BIT |

		 SMC91X_NOWAIT,

};



static struct platform_device realview_eth_device = {