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

Commit fc86e522 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.4@89074de (v4.4.94) into msm-4.4"

parents 3c586a77 dbad9b8f

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 93

SUBLEVEL = 94

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/mips/include/asm/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <irq.h>



#define IRQ_STACK_SIZE			THREAD_SIZE

#define IRQ_STACK_START			(IRQ_STACK_SIZE - sizeof(unsigned long))

#define IRQ_STACK_START			(IRQ_STACK_SIZE - 16)



extern void *irq_stack[NR_CPUS];

arch/sparc/include/asm/setup.h

+4 −1
Original line number Diff line number Diff line
@@ -59,8 +59,11 @@ extern atomic_t dcpage_flushes; 
extern atomic_t dcpage_flushes_xcall;



extern int sysctl_tsb_ratio;

#endif



#ifdef CONFIG_SERIAL_SUNHV

void sunhv_migrate_hvcons_irq(int cpu);

#endif

#endif

void sun_do_break(void);

extern int stop_a_enabled;

extern int scons_pwroff;

arch/sparc/kernel/smp_64.c

+5 −1
Original line number Diff line number Diff line
@@ -1443,8 +1443,12 @@ void smp_send_stop(void) 
	int cpu;



	if (tlb_type == hypervisor) {

		int this_cpu = smp_processor_id();

#ifdef CONFIG_SERIAL_SUNHV

		sunhv_migrate_hvcons_irq(this_cpu);

#endif

		for_each_online_cpu(cpu) {

			if (cpu == smp_processor_id())

			if (cpu == this_cpu)

				continue;

#ifdef CONFIG_SUN_LDOMS

			if (ldom_domaining_enabled) {

block/bsg-lib.c

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ static int bsg_create_job(struct device *dev, struct request *req) 
failjob_rls_rqst_payload:

	kfree(job->request_payload.sg_list);

failjob_rls_job:

	kfree(job);

	return -ENOMEM;

}