Merge tag 'acpi-5.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-block.git] / kernel / extable.c

diff --git a/kernel/extable.c b/kernel/extable.c
index 290661f68e6b331ecd835c96fc4126a3bb2631d2..b6f330f0fe7496ad34d21fda39e494edb381d262 100644 (file)
--- a/kernel/extable.c
+++ b/kernel/extable.c
@@ -62,40 +62,13 @@ const struct exception_table_entry *search_exception_tables(unsigned long addr)
        return e;
 }
 
-int init_kernel_text(unsigned long addr)
-{
-       if (addr >= (unsigned long)_sinittext &&
-           addr < (unsigned long)_einittext)
-               return 1;
-       return 0;
-}
-
 int notrace core_kernel_text(unsigned long addr)
 {
-       if (addr >= (unsigned long)_stext &&
-           addr < (unsigned long)_etext)
+       if (is_kernel_text(addr))
                return 1;
 
        if (system_state < SYSTEM_FREEING_INITMEM &&
-           init_kernel_text(addr))
-               return 1;
-       return 0;
-}
-
-/**
- * core_kernel_data - tell if addr points to kernel data
- * @addr: address to test
- *
- * Returns true if @addr passed in is from the core kernel data
- * section.
- *
- * Note: On some archs it may return true for core RODATA, and false
- *  for others. But will always be true for core RW data.
- */
-int core_kernel_data(unsigned long addr)
-{
-       if (addr >= (unsigned long)_sdata &&
-           addr < (unsigned long)_edata)
+           is_kernel_inittext(addr))
                return 1;
        return 0;
 }
@@ -112,7 +85,7 @@ int __kernel_text_address(unsigned long addr)
         * Since we are after the module-symbols check, there's
         * no danger of address overlap:
         */
-       if (init_kernel_text(addr))
+       if (is_kernel_inittext(addr))
                return 1;
        return 0;
 }