Skip to content

Commit 16b8921

Browse files
committed
Merge: s390/entry: Mark IRQ entries to fix stack depot warnings
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6221 JIRA: https://issues.redhat.com/browse/RHEL-74468 commits: ``` 45c9f2b ``` Signed-off-by: Mete Durlu <mdurlu@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Rado Vrbovsky <rvrbovsk@redhat.com>
2 parents e1de100 + 8305b93 commit 16b8921

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

arch/s390/kernel/entry.S

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,9 +456,13 @@ SYM_CODE_START(\name)
456456
SYM_CODE_END(\name)
457457
.endm
458458

459+
.section .irqentry.text, "ax"
460+
459461
INT_HANDLER ext_int_handler,__LC_EXT_OLD_PSW,do_ext_irq
460462
INT_HANDLER io_int_handler,__LC_IO_OLD_PSW,do_io_irq
461463

464+
.section .kprobes.text, "ax"
465+
462466
/*
463467
* Load idle PSW.
464468
*/

arch/s390/kernel/kprobes.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,12 @@ int __init arch_init_kprobes(void)
536536
return 0;
537537
}
538538

539+
int __init arch_populate_kprobe_blacklist(void)
540+
{
541+
return kprobe_add_area_blacklist((unsigned long)__irqentry_text_start,
542+
(unsigned long)__irqentry_text_end);
543+
}
544+
539545
int arch_trampoline_kprobe(struct kprobe *p)
540546
{
541547
return 0;

0 commit comments

Comments
 (0)