From: Al Viro <[email protected]>
Signed-off-by: Al Viro <[email protected]>
---
arch/sparc/kernel/irq_64.c | 3 +--
arch/sparc/mm/iommu.c | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
index 8858bb0..54a55ce 100644
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
@@ -1019,9 +1019,8 @@ static void __init alloc_one_queue(unsigned long *pa_ptr,
unsigned long qmask)
{
unsigned long size = PAGE_ALIGN(qmask + 1);
unsigned long order = get_order(size);
- unsigned long p;
+ void *p = get_free_pages(GFP_KERNEL, order);
- p = __get_free_pages(GFP_KERNEL, order);
if (!p) {
prom_printf("SUN4V: Error, cannot allocate queue.\n");
prom_halt();
diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c
index f9d30bd..113dabf 100644
--- a/arch/sparc/mm/iommu.c
+++ b/arch/sparc/mm/iommu.c
@@ -60,7 +60,7 @@ static void __init sbus_iommu_init(struct platform_device *op)
unsigned long *bitmap;
unsigned long control;
unsigned long base;
- unsigned long tmp;
+ iopte_t *tmp;
iommu = kmalloc(sizeof(struct iommu_struct), GFP_KERNEL);
if (!iommu) {
@@ -91,13 +91,13 @@ static void __init sbus_iommu_init(struct platform_device
*op)
We need 256K or 512K or 1M or 2M area aligned to
its size and current gfp will fortunately give
it to us. */
- tmp = __get_free_pages(GFP_KERNEL, IOMMU_ORDER);
+ tmp = get_free_pages(GFP_KERNEL, IOMMU_ORDER);
if (!tmp) {
prom_printf("Unable to allocate iommu table [0x%lx]\n",
IOMMU_NPTES * sizeof(iopte_t));
prom_halt();
}
- iommu->page_table = (iopte_t *)tmp;
+ iommu->page_table = tmp;
/* Initialize new table. */
memset(iommu->page_table, 0, IOMMU_NPTES*sizeof(iopte_t));
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
