diff options
Diffstat (limited to 'arch/x86/kernel/acpi/boot.c')
-rw-r--r-- | arch/x86/kernel/acpi/boot.c | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 0ca27c7b0e8d..719c74b0141a 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -581,25 +581,6 @@ int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base) | |||
581 | 581 | ||
582 | EXPORT_SYMBOL(acpi_unregister_ioapic); | 582 | EXPORT_SYMBOL(acpi_unregister_ioapic); |
583 | 583 | ||
584 | static unsigned long __init | ||
585 | acpi_scan_rsdp(unsigned long start, unsigned long length) | ||
586 | { | ||
587 | unsigned long offset = 0; | ||
588 | unsigned long sig_len = sizeof("RSD PTR ") - 1; | ||
589 | |||
590 | /* | ||
591 | * Scan all 16-byte boundaries of the physical memory region for the | ||
592 | * RSDP signature. | ||
593 | */ | ||
594 | for (offset = 0; offset < length; offset += 16) { | ||
595 | if (strncmp((char *)(phys_to_virt(start) + offset), "RSD PTR ", sig_len)) | ||
596 | continue; | ||
597 | return (start + offset); | ||
598 | } | ||
599 | |||
600 | return 0; | ||
601 | } | ||
602 | |||
603 | static int __init acpi_parse_sbf(struct acpi_table_header *table) | 584 | static int __init acpi_parse_sbf(struct acpi_table_header *table) |
604 | { | 585 | { |
605 | struct acpi_table_boot *sb; | 586 | struct acpi_table_boot *sb; |
@@ -742,27 +723,6 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table) | |||
742 | return 0; | 723 | return 0; |
743 | } | 724 | } |
744 | 725 | ||
745 | unsigned long __init acpi_find_rsdp(void) | ||
746 | { | ||
747 | unsigned long rsdp_phys = 0; | ||
748 | |||
749 | if (efi_enabled) { | ||
750 | if (efi.acpi20 != EFI_INVALID_TABLE_ADDR) | ||
751 | return efi.acpi20; | ||
752 | else if (efi.acpi != EFI_INVALID_TABLE_ADDR) | ||
753 | return efi.acpi; | ||
754 | } | ||
755 | /* | ||
756 | * Scan memory looking for the RSDP signature. First search EBDA (low | ||
757 | * memory) paragraphs and then search upper memory (E0000-FFFFF). | ||
758 | */ | ||
759 | rsdp_phys = acpi_scan_rsdp(0, 0x400); | ||
760 | if (!rsdp_phys) | ||
761 | rsdp_phys = acpi_scan_rsdp(0xE0000, 0x20000); | ||
762 | |||
763 | return rsdp_phys; | ||
764 | } | ||
765 | |||
766 | #ifdef CONFIG_X86_LOCAL_APIC | 726 | #ifdef CONFIG_X86_LOCAL_APIC |
767 | /* | 727 | /* |
768 | * Parse LAPIC entries in MADT | 728 | * Parse LAPIC entries in MADT |