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

Commit 75c61941 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.105 (8a539624) into msm-4.4"

parents e525ef12 33260fbf

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 104

SUBLEVEL = 105

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/mach-omap1/dma.c

+7 −9
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include "soc.h"



#define OMAP1_DMA_BASE			(0xfffed800)

#define OMAP1_LOGICAL_DMA_CH_COUNT	17



static u32 enable_1510_mode;
@@ -311,8 +310,6 @@ static int __init omap1_system_dma_init(void) 
		goto exit_iounmap;

	}



	d->lch_count		= OMAP1_LOGICAL_DMA_CH_COUNT;



	/* Valid attributes for omap1 plus processors */

	if (cpu_is_omap15xx())

		d->dev_caps = ENABLE_1510_MODE;
@@ -329,13 +326,14 @@ static int __init omap1_system_dma_init(void) 
	d->dev_caps		|= CLEAR_CSR_ON_READ;

	d->dev_caps		|= IS_WORD_16;



	if (cpu_is_omap15xx())

		d->chan_count = 9;

	else if (cpu_is_omap16xx() || cpu_is_omap7xx()) {

		if (!(d->dev_caps & ENABLE_1510_MODE))

			d->chan_count = 16;

	/* available logical channels */

	if (cpu_is_omap15xx()) {

		d->lch_count = 9;

	} else {

		if (d->dev_caps & ENABLE_1510_MODE)

			d->lch_count = 9;

		else

			d->chan_count = 9;

			d->lch_count = 16;

	}



	p = dma_plat_info;

arch/s390/include/asm/pci_insn.h

+1 −1
Original line number Diff line number Diff line
@@ -81,6 +81,6 @@ int zpci_refresh_trans(u64 fn, u64 addr, u64 range); 
int zpci_load(u64 *data, u64 req, u64 offset);

int zpci_store(u64 data, u64 req, u64 offset);

int zpci_store_block(const u64 *data, u64 req, u64 offset);

void zpci_set_irq_ctrl(u16 ctl, char *unused, u8 isc);

int zpci_set_irq_ctrl(u16 ctl, char *unused, u8 isc);



#endif

arch/s390/include/asm/runtime_instr.h

+3 −1
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ static inline void restore_ri_cb(struct runtime_instr_cb *cb_next, 
		load_runtime_instr_cb(&runtime_instr_empty_cb);

}



void exit_thread_runtime_instr(void);

struct task_struct;



void runtime_instr_release(struct task_struct *tsk);



#endif /* _RUNTIME_INSTR_H */

arch/s390/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ extern void kernel_thread_starter(void); 
 */

void exit_thread(void)

{

	exit_thread_runtime_instr();

}



void flush_thread(void)
@@ -87,6 +86,7 @@ void arch_release_task_struct(struct task_struct *tsk) 
{

	/* Free either the floating-point or the vector register save area */

	kfree(tsk->thread.fpu.regs);

	runtime_instr_release(tsk);

}



int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)