diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-27 04:31:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-27 04:31:44 -0400 |
| commit | 6856b8e53609ee3eff7e3173e4e5d979f47d834d (patch) | |
| tree | c2f9e364889fa07e20081b198a085a4ed7b26bd3 /drivers/android/binder_alloc.h | |
| parent | 57646b6fda9b751e62929c73b1e6df06b108a3c9 (diff) | |
| parent | 2eece390bf68ec8f733d7e4a3ba8a5ea350082ae (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/android/binder_alloc.h')
| -rw-r--r-- | drivers/android/binder_alloc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/android/binder_alloc.h b/drivers/android/binder_alloc.h index a3a3602c689c..2dd33b6df104 100644 --- a/drivers/android/binder_alloc.h +++ b/drivers/android/binder_alloc.h | |||
| @@ -100,7 +100,6 @@ struct binder_lru_page { | |||
| 100 | */ | 100 | */ |
| 101 | struct binder_alloc { | 101 | struct binder_alloc { |
| 102 | struct mutex mutex; | 102 | struct mutex mutex; |
| 103 | struct task_struct *tsk; | ||
| 104 | struct vm_area_struct *vma; | 103 | struct vm_area_struct *vma; |
| 105 | struct mm_struct *vma_vm_mm; | 104 | struct mm_struct *vma_vm_mm; |
| 106 | void *buffer; | 105 | void *buffer; |