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

Commit 7b36094a authored by threader's avatar threader Committed by Bernhard Thoben
Browse files

BINDER: Clean up pick conflict

parent c4ce50a3

drivers/android/binder.c

+6 −6
Original line number Diff line number Diff line
@@ -5408,7 +5408,7 @@ static int binder_open(struct inode *nodp, struct file *filp) 
		 * contexts of a given PID.

		 */

		binderfs_entry = binderfs_create_file(binder_binderfs_dir_entry_proc,

			strbuf, &binder_proc_fops, (void *)(unsigned long)proc->pid);

			strbuf, &proc_fops, (void *)(unsigned long)proc->pid);

		if (!IS_ERR(binderfs_entry)) {

			proc->binderfs_entry = binderfs_entry;

		} else {
@@ -6272,27 +6272,27 @@ static int __init binder_init(void) 
				    0444,

				    binder_debugfs_dir_entry_root,

				    NULL,

				    &state_fops);

				    &binder_state_fops);

		debugfs_create_file("stats",

				    0444,

				    binder_debugfs_dir_entry_root,

				    NULL,

				    &stats_fops);

				    &binder_stats_fops);

		debugfs_create_file("transactions",

				    0444,

				    binder_debugfs_dir_entry_root,

				    NULL,

				    &transactions_fops);

				    &binder_transactions_fops);

		debugfs_create_file("transaction_log",

				    0444,

				    binder_debugfs_dir_entry_root,

				    &binder_transaction_log,

				    &transaction_log_fops);

				    &binder_transaction_log_fops);

		debugfs_create_file("failed_transaction_log",

				    0444,

				    binder_debugfs_dir_entry_root,

				    &binder_transaction_log_failed,

				    &transaction_log_fops);

				    &binder_transaction_log_fops);

	}



	/*