aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2015-12-04 22:48:30 +0100
committerJiri Kosina <jkosina@suse.cz>2015-12-04 22:48:30 +0100
commitfc284d631894d8673d229fad92762b66c9875cab (patch)
tree7b530667b9f7c5c4899c024abda518283abf80b4 /drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
parentlivepatch: function,sympos scheme in livepatch sysfs directory (diff)
parentmodule: keep percpu symbols in module's symtab (diff)
downloadlinux-rng-fc284d631894d8673d229fad92762b66c9875cab.tar.xz
linux-rng-fc284d631894d8673d229fad92762b66c9875cab.zip
Merge branch 'from-rusty/modules-next' into for-4.5/core
As agreed with Rusty, we're taking a current module-next pile through livepatching.git, as it contains solely patches that are pre-requisity for module page protection cleanups in livepatching. Rusty will be restarting module-next from scratch. Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
index 0212b31dc194..8b88edb0434b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
@@ -311,8 +311,7 @@ static bool amdgpu_sa_bo_next_hole(struct amdgpu_sa_manager *sa_manager,
return false;
}
-int amdgpu_sa_bo_new(struct amdgpu_device *adev,
- struct amdgpu_sa_manager *sa_manager,
+int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager,
struct amdgpu_sa_bo **sa_bo,
unsigned size, unsigned align)
{