diff options
author | Matthew Wilcox <willy@parisc-linux.org> | 2005-10-21 22:36:40 -0400 |
---|---|---|
committer | Kyle McMartin <kyle@parisc-linux.org> | 2005-10-21 22:36:40 -0400 |
commit | 53f01bba49938f115237fe43a261c31ac13ae5c6 (patch) | |
tree | df2a5fa9d95c7e69447ac0c89d6e149888c9bd1c /arch/parisc/kernel/processor.c | |
parent | bdad1f836ab1ca2b18a625222f63f630cfd14e41 (diff) |
[PARISC] Convert parisc_device to use struct resource for hpa
Convert pa_dev->hpa from an unsigned long to a struct resource.
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Fix up users of ->hpa to use ->hpa.start instead.
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'arch/parisc/kernel/processor.c')
-rw-r--r-- | arch/parisc/kernel/processor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c index 13b721cb9f55..4f5bbcf1f5a4 100644 --- a/arch/parisc/kernel/processor.c +++ b/arch/parisc/kernel/processor.c | |||
@@ -92,7 +92,7 @@ static int __init processor_probe(struct parisc_device *dev) | |||
92 | * May get overwritten by PAT code. | 92 | * May get overwritten by PAT code. |
93 | */ | 93 | */ |
94 | cpuid = boot_cpu_data.cpu_count; | 94 | cpuid = boot_cpu_data.cpu_count; |
95 | txn_addr = dev->hpa; /* for legacy PDC */ | 95 | txn_addr = dev->hpa.start; /* for legacy PDC */ |
96 | 96 | ||
97 | #ifdef __LP64__ | 97 | #ifdef __LP64__ |
98 | if (is_pdc_pat()) { | 98 | if (is_pdc_pat()) { |
@@ -122,7 +122,7 @@ static int __init processor_probe(struct parisc_device *dev) | |||
122 | * boot time (ie shutdown a CPU from an OS perspective). | 122 | * boot time (ie shutdown a CPU from an OS perspective). |
123 | */ | 123 | */ |
124 | /* get the cpu number */ | 124 | /* get the cpu number */ |
125 | status = pdc_pat_cpu_get_number(&cpu_info, dev->hpa); | 125 | status = pdc_pat_cpu_get_number(&cpu_info, dev->hpa.start); |
126 | 126 | ||
127 | BUG_ON(PDC_OK != status); | 127 | BUG_ON(PDC_OK != status); |
128 | 128 | ||
@@ -130,7 +130,7 @@ static int __init processor_probe(struct parisc_device *dev) | |||
130 | printk(KERN_WARNING "IGNORING CPU at 0x%x," | 130 | printk(KERN_WARNING "IGNORING CPU at 0x%x," |
131 | " cpu_slot_id > NR_CPUS" | 131 | " cpu_slot_id > NR_CPUS" |
132 | " (%ld > %d)\n", | 132 | " (%ld > %d)\n", |
133 | dev->hpa, cpu_info.cpu_num, NR_CPUS); | 133 | dev->hpa.start, cpu_info.cpu_num, NR_CPUS); |
134 | /* Ignore CPU since it will only crash */ | 134 | /* Ignore CPU since it will only crash */ |
135 | boot_cpu_data.cpu_count--; | 135 | boot_cpu_data.cpu_count--; |
136 | return 1; | 136 | return 1; |
@@ -149,7 +149,7 @@ static int __init processor_probe(struct parisc_device *dev) | |||
149 | 149 | ||
150 | p->loops_per_jiffy = loops_per_jiffy; | 150 | p->loops_per_jiffy = loops_per_jiffy; |
151 | p->dev = dev; /* Save IODC data in case we need it */ | 151 | p->dev = dev; /* Save IODC data in case we need it */ |
152 | p->hpa = dev->hpa; /* save CPU hpa */ | 152 | p->hpa = dev->hpa.start; /* save CPU hpa */ |
153 | p->cpuid = cpuid; /* save CPU id */ | 153 | p->cpuid = cpuid; /* save CPU id */ |
154 | p->txn_addr = txn_addr; /* save CPU IRQ address */ | 154 | p->txn_addr = txn_addr; /* save CPU IRQ address */ |
155 | #ifdef CONFIG_SMP | 155 | #ifdef CONFIG_SMP |