Commit 7a9c67a6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: android: binder: fix build errors 



This fixes the build errors and warnings in the binder driver.  It can't
be a module, due to a lack of some of the symbols being exported.

Also added a MODULE_LICENSE(), as it was missing.

Cc: Arve Hjønnevåg <arve@android.com>
Cc: Brian Swetland <swetland@google.com>
Cc: Robert Love <rlove@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 08b88cc7

drivers/staging/android/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ config ANDROID 
	  Enable support for various drivers needed on the Android platform



config ANDROID_BINDER_IPC

	tristate "Android Binder IPC Driver"

	default y

	bool "Android Binder IPC Driver"

	default n



config ANDROID_LOGGER

	tristate "Android log driver"

drivers/staging/android/binder.c

+4 −3
Original line number Diff line number Diff line
@@ -2649,14 +2649,14 @@ static void binder_vma_open(struct vm_area_struct *vma) 
{

	struct binder_proc *proc = vma->vm_private_data;

	if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE)

		printk(KERN_INFO "binder: %d open vm area %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, vma->vm_page_prot);

		printk(KERN_INFO "binder: %d open vm area %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, vma->vm_page_prot.pgprot);

	dump_stack();

}

static void binder_vma_close(struct vm_area_struct *vma)

{

	struct binder_proc *proc = vma->vm_private_data;

	if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE)

		printk(KERN_INFO "binder: %d close vm area %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, vma->vm_page_prot);

		printk(KERN_INFO "binder: %d close vm area %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, vma->vm_page_prot.pgprot);

	proc->vma = NULL;

}
@@ -2677,7 +2677,7 @@ static int binder_mmap(struct file *filp, struct vm_area_struct *vma) 
		vma->vm_end = vma->vm_start + SZ_4M;



	if (binder_debug_mask & BINDER_DEBUG_OPEN_CLOSE)

		printk(KERN_INFO "binder_mmap: %d %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, vma->vm_page_prot);

		printk(KERN_INFO "binder_mmap: %d %lx-%lx (%ld K) vma %lx pagep %lx\n", proc->pid, vma->vm_start, vma->vm_end, (vma->vm_end - vma->vm_start) / SZ_1K, vma->vm_flags, vma->vm_page_prot.pgprot);



	if (vma->vm_flags & FORBIDDEN_MMAP_FLAGS) {

		ret = -EPERM;
@@ -3500,3 +3500,4 @@ static int __init binder_init(void) 


device_initcall(binder_init);



MODULE_LICENSE("GPL v2");

CRA Git | Maintained and supported by SUSTech CRA and CCSE