summaryrefslogtreecommitdiff
path: root/kernel/resource.c
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2024-11-05 09:43:47 +0100
committerThomas Zimmermann <tzimmermann@suse.de>2024-11-05 09:43:47 +0100
commite301aea030d60da760f85f854a82ce788d5cf6e7 (patch)
tree0518946973b140be8105fb5b5bc45760675e5d1d /kernel/resource.c
parentb04ce1e718bd55302b52d05d6873e233cb3ec7a1 (diff)
parent59b723cd2adbac2a34fc8e12c74ae26ae45bf230 (diff)
downloadlinux-e301aea030d60da760f85f854a82ce788d5cf6e7.tar.gz
linux-e301aea030d60da760f85f854a82ce788d5cf6e7.tar.bz2
linux-e301aea030d60da760f85f854a82ce788d5cf6e7.zip
Merge drm/drm-fixes into drm-misc-fixes
Backmerging to get the latest fixes from v6.12-rc6. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'kernel/resource.c')
-rw-r--r--kernel/resource.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/resource.c b/kernel/resource.c
index b730bd28b422..4101016e8b20 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -459,9 +459,7 @@ int walk_system_ram_res_rev(u64 start, u64 end, void *arg,
rams_size += 16;
}
- rams[i].start = res.start;
- rams[i++].end = res.end;
-
+ rams[i++] = res;
start = res.end + 1;
}