diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-21 15:15:33 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-05-21 15:15:33 +0100 |
| commit | 4ab1056766a4e49f6b9ef324313dd1583f8f8f4e (patch) | |
| tree | 89f975e7e021dd27dc807e45445e963aeb39fcda /arch/arm/mm/fault.c | |
| parent | 4175160b065e74572819a320dcd34129224a4e1c (diff) | |
| parent | 4cdfc2ec72e940abb4322aa1bc14f43a1486fc5d (diff) | |
| download | talos-obmc-linux-4ab1056766a4e49f6b9ef324313dd1583f8f8f4e.tar.gz talos-obmc-linux-4ab1056766a4e49f6b9ef324313dd1583f8f8f4e.zip | |
Merge branch 'v3-removal' into for-linus
Conflicts:
arch/arm/boot/compressed/head.S
Diffstat (limited to 'arch/arm/mm/fault.c')
| -rw-r--r-- | arch/arm/mm/fault.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 5bb48356d217..c3bd83450227 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -432,9 +432,6 @@ do_translation_fault(unsigned long addr, unsigned int fsr, index = pgd_index(addr); - /* - * FIXME: CP15 C1 is write only on ARMv3 architectures. - */ pgd = cpu_get_pgd() + index; pgd_k = init_mm.pgd + index; |
