From 19dd8724942d4998ccaa090daa2a69b33648d2bb Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Sat, 16 Feb 2013 18:43:35 -0500 Subject: Fix mistakes in merge Change-Id: Ib92c3067dec28605e8905daddc44a667683bebc7 --- arch/arm/include/asm/hwcap.h | 1 + mm/vmalloc.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/hwcap.h b/arch/arm/include/asm/hwcap.h index 2a0e8b8..39dfd7e 100644 --- a/arch/arm/include/asm/hwcap.h +++ b/arch/arm/include/asm/hwcap.h @@ -24,6 +24,7 @@ #define HWCAP_VFPv4 (1 << 16) #define HWCAP_IDIVA (1 << 17) #define HWCAP_IDIVT (1 << 18) +#define HWCAP_VFPD32 (1 << 19) /* set if VFP has 32 regs (not 16) */ #define HWCAP_IDIV (HWCAP_IDIVA | HWCAP_IDIVT) diff --git a/mm/vmalloc.c b/mm/vmalloc.c index a819c35..e9c4611 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1279,7 +1279,6 @@ static void setup_vmalloc_vm(struct vm_struct *vm, struct vmap_area *va, vm->pid = current->pid; vm->task_name = current->comm; #endif - va->private = vm; va->vm = vm; va->flags |= VM_VM_AREA; } -- cgit v1.1