On Wednesday 06 February 2013, Joonsoo Kim wrote:
> @@ -859,17 +864,12 @@ static void __init pci_reserve_io(void)
> {
> struct vm_struct *vm;
> unsigned long addr;
> + struct static_vm *svm;
>
> - /* we're still single threaded hence no lock needed here */
> - for (vm = vmlist; vm; vm = vm->next) {
> - if (!(vm->flags & VM_ARM_STATIC_MAPPING))
> - continue;
> - addr = (unsigned long)vm->addr;
> - addr &= ~(SZ_2M - 1);
> - if (addr == PCI_IO_VIRT_BASE)
> - return;
> + svm = find_static_vm_vaddr((void *)PCI_IO_VIRT_BASE);
> + if (svm)
> + return;
>
> - }
This is causing build warnings in a bunch of configurations now,
see patch below.
Arnd
8<-----
ARM: mm: remove unused variables in pci_reserve_io
Patch "ARM: 7646/1: mm: use static_vm for managing static mapped areas"
removed code from pci_reserve_io but left variable declarations
in place that are now unused, as gcc correctly warns.
Signed-off-by: Arnd Bergmann <a...@arndb.de>
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index c6fe15a..c6d45c8 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -901,8 +901,6 @@ static void __init fill_pmd_gaps(void)
#if defined(CONFIG_PCI) && !defined(CONFIG_NEED_MACH_IO_H)
static void __init pci_reserve_io(void)
{
- struct vm_struct *vm;
- unsigned long addr;
struct static_vm *svm;
svm = find_static_vm_vaddr((void *)PCI_IO_VIRT_BASE);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
