diff options
| author | Rob Clark <robdclark@chromium.org> | 2023-03-20 10:31:25 -0700 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2023-03-20 10:31:25 -0700 |
| commit | e752ab11dcb48353727ea26eefd740155e028865 (patch) | |
| tree | bbd47198be4e42bbf990096ca36e96f3da40cfb6 /include/asm-generic/vmlinux.lds.h | |
| parent | 1844e680d56bb0c4e0489138f2b7ba2dc1c988e3 (diff) | |
| parent | 8bf6e20253b2d2b614f2c0b491f840e956fa6b05 (diff) | |
Merge remote-tracking branch 'drm/drm-next' into msm-next
Merge drm-next into msm-next to pick up external clk and PM dependencies
for improved a6xx GPU reset sequence.
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'include/asm-generic/vmlinux.lds.h')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 659bf3b31c91..d1f57e4868ed 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -558,6 +558,9 @@ ALIGN_FUNCTION(); \ __noinstr_text_start = .; \ *(.noinstr.text) \ + __cpuidle_text_start = .; \ + *(.cpuidle.text) \ + __cpuidle_text_end = .; \ __noinstr_text_end = .; /* @@ -598,12 +601,6 @@ *(.spinlock.text) \ __lock_text_end = .; -#define CPUIDLE_TEXT \ - ALIGN_FUNCTION(); \ - __cpuidle_text_start = .; \ - *(.cpuidle.text) \ - __cpuidle_text_end = .; - #define KPROBES_TEXT \ ALIGN_FUNCTION(); \ __kprobes_text_start = .; \ |