diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-08-19 23:50:43 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 10:52:56 -0400 |
commit | c691cc84529ec88ccb32b174535bb61875888c90 (patch) | |
tree | 9eb63d323efd012f885478f695e2e2c7e7080442 /arch | |
parent | 26d347c2c035b1f4c5b3c5094f3046db9ec920f5 (diff) |
io_apic: make 32 bit have io_apic resource in /proc/iomem
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/io_apic.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c index fba6d6ee3480..7e303e0967a4 100644 --- a/arch/x86/kernel/io_apic.c +++ b/arch/x86/kernel/io_apic.c | |||
@@ -3802,7 +3802,6 @@ void __init setup_ioapic_dest(void) | |||
3802 | } | 3802 | } |
3803 | #endif | 3803 | #endif |
3804 | 3804 | ||
3805 | #ifdef CONFIG_X86_64 | ||
3806 | #define IOAPIC_RESOURCE_NAME_SIZE 11 | 3805 | #define IOAPIC_RESOURCE_NAME_SIZE 11 |
3807 | 3806 | ||
3808 | static struct resource *ioapic_resources; | 3807 | static struct resource *ioapic_resources; |
@@ -3838,17 +3837,14 @@ static struct resource * __init ioapic_setup_resources(void) | |||
3838 | 3837 | ||
3839 | return res; | 3838 | return res; |
3840 | } | 3839 | } |
3841 | #endif | ||
3842 | 3840 | ||
3843 | void __init ioapic_init_mappings(void) | 3841 | void __init ioapic_init_mappings(void) |
3844 | { | 3842 | { |
3845 | unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0; | 3843 | unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0; |
3846 | int i; | 3844 | int i; |
3847 | #ifdef CONFIG_X86_64 | ||
3848 | struct resource *ioapic_res; | 3845 | struct resource *ioapic_res; |
3849 | 3846 | ||
3850 | ioapic_res = ioapic_setup_resources(); | 3847 | ioapic_res = ioapic_setup_resources(); |
3851 | #endif | ||
3852 | for (i = 0; i < nr_ioapics; i++) { | 3848 | for (i = 0; i < nr_ioapics; i++) { |
3853 | if (smp_found_config) { | 3849 | if (smp_found_config) { |
3854 | ioapic_phys = mp_ioapics[i].mp_apicaddr; | 3850 | ioapic_phys = mp_ioapics[i].mp_apicaddr; |
@@ -3877,17 +3873,14 @@ fake_ioapic_page: | |||
3877 | __fix_to_virt(idx), ioapic_phys); | 3873 | __fix_to_virt(idx), ioapic_phys); |
3878 | idx++; | 3874 | idx++; |
3879 | 3875 | ||
3880 | #ifdef CONFIG_X86_64 | ||
3881 | if (ioapic_res != NULL) { | 3876 | if (ioapic_res != NULL) { |
3882 | ioapic_res->start = ioapic_phys; | 3877 | ioapic_res->start = ioapic_phys; |
3883 | ioapic_res->end = ioapic_phys + (4 * 1024) - 1; | 3878 | ioapic_res->end = ioapic_phys + (4 * 1024) - 1; |
3884 | ioapic_res++; | 3879 | ioapic_res++; |
3885 | } | 3880 | } |
3886 | #endif | ||
3887 | } | 3881 | } |
3888 | } | 3882 | } |
3889 | 3883 | ||
3890 | #ifdef CONFIG_X86_64 | ||
3891 | static int __init ioapic_insert_resources(void) | 3884 | static int __init ioapic_insert_resources(void) |
3892 | { | 3885 | { |
3893 | int i; | 3886 | int i; |
@@ -3910,4 +3903,3 @@ static int __init ioapic_insert_resources(void) | |||
3910 | /* Insert the IO APIC resources after PCI initialization has occured to handle | 3903 | /* Insert the IO APIC resources after PCI initialization has occured to handle |
3911 | * IO APICS that are mapped in on a BAR in PCI space. */ | 3904 | * IO APICS that are mapped in on a BAR in PCI space. */ |
3912 | late_initcall(ioapic_insert_resources); | 3905 | late_initcall(ioapic_insert_resources); |
3913 | #endif | ||