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

Commit f5c99a55 authored by Dyneteve's avatar Dyneteve
Browse files

staging: Update binder driver 

Change-Id: I948b327cc7c40cd2bea739f3dae66e93c7233655
parent 65cef798

drivers/staging/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -59,6 +59,4 @@ obj-$(CONFIG_FIREWIRE_SERIAL) += fwserial/ 
obj-$(CONFIG_ZCACHE)		+= zcache/

obj-$(CONFIG_GOLDFISH)		+= goldfish/

obj-$(CONFIG_USB_DWC2)		+= dwc2/



obj-$(CONFIG_PRIMA_WLAN) += prima/

obj-$(CONFIG_PRONTO_WLAN)	+= prima/

drivers/staging/android/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -38,6 +38,16 @@ config ANDROID_BINDER_DEVICES 
	  created. Each binder device has its own context manager, and is

	  therefore logically separated from the other devices.



config ANDROID_BINDER_IPC_SELFTEST

        bool "Android Binder IPC Driver Selftest"

        depends on ANDROID_BINDER_IPC

        ---help---

          This feature allows binder selftest to run.



          Binder selftest checks the allocation and free of binder buffers

          exhaustively with combinations of various buffer sizes and

          alignments.



config ASHMEM

	bool "Enable the Anonymous Shared Memory Subsystem"

	default n

drivers/staging/android/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ ccflags-y += -I$(src) # needed for trace events 
obj-y					+= ion/

obj-$(CONFIG_FIQ_DEBUGGER)		+= fiq_debugger/



obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o

obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o binder_alloc.o

obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o

obj-$(CONFIG_ASHMEM)			+= ashmem.o

obj-$(CONFIG_ANDROID_LOGGER)		+= logger.o

obj-$(CONFIG_ANDROID_TIMED_OUTPUT)	+= timed_output.o

drivers/staging/android/alarm-dev.c

+1 −0
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ static int alarm_release(struct inode *inode, struct file *file) 
	if (file->private_data) {

		for (i = 0; i < ANDROID_ALARM_TYPE_COUNT; i++) {

			uint32_t alarm_type_mask = 1U << i;



			if (alarm_enabled & alarm_type_mask) {

				alarm_dbg(INFO,

					  "%s: clear alarm, pending %d\n",

drivers/staging/android/ashmem.c

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static int ashmem_shrink(struct shrinker *s, struct shrink_control *sc) 
		loff_t start = range->pgstart * PAGE_SIZE;

		loff_t end = (range->pgend + 1) * PAGE_SIZE;



			range->asma->file->f_op->fallocate(range->asma->file,

		do_fallocate(range->asma->file,

				FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,

				start, end - start);

		range->purged = ASHMEM_WAS_PURGED;