diff options
| author | Andrew Dodd <atd7@cornell.edu> | 2013-02-16 18:43:35 -0500 |
|---|---|---|
| committer | Andrew Dodd <atd7@cornell.edu> | 2013-02-27 09:19:13 -0500 |
| commit | 19dd8724942d4998ccaa090daa2a69b33648d2bb (patch) | |
| tree | 3ac48587c33355b9b1d08b70916249c5392a88ec | |
| parent | b08797f2afdfc604c3143f8725d058aeef8ddcb2 (diff) | |
| download | kernel_samsung_smdk4412-19dd8724942d4998ccaa090daa2a69b33648d2bb.zip kernel_samsung_smdk4412-19dd8724942d4998ccaa090daa2a69b33648d2bb.tar.gz kernel_samsung_smdk4412-19dd8724942d4998ccaa090daa2a69b33648d2bb.tar.bz2 | |
Fix mistakes in merge
Change-Id: Ib92c3067dec28605e8905daddc44a667683bebc7
| -rw-r--r-- | arch/arm/include/asm/hwcap.h | 1 | ||||
| -rw-r--r-- | mm/vmalloc.c | 1 |
2 files changed, 1 insertions, 1 deletions
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; } |