diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-20 18:53:11 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-20 18:53:11 -0500 |
| commit | 749f583f3405f93bf56ed5dd0be1d65c06db6f0f (patch) | |
| tree | c65a5139a9122a140a8d46c08ea882a6a900f4be /arch/arm/mm | |
| parent | ef1a68848a968f7347cf7eea24072464059af8f1 (diff) | |
| parent | 345a32296b1f9f6121379e0240915e0e2be2dbf5 (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop into devel-stable
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/proc-xsc3.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S index 2028f3702881..fab134e29826 100644 --- a/arch/arm/mm/proc-xsc3.S +++ b/arch/arm/mm/proc-xsc3.S | |||
| @@ -396,7 +396,7 @@ __xsc3_setup: | |||
| 396 | orr r4, r4, #0x18 @ cache the page table in L2 | 396 | orr r4, r4, #0x18 @ cache the page table in L2 |
| 397 | mcr p15, 0, r4, c2, c0, 0 @ load page table pointer | 397 | mcr p15, 0, r4, c2, c0, 0 @ load page table pointer |
| 398 | 398 | ||
| 399 | mov r0, #0 @ don't allow CP access | 399 | mov r0, #1 << 6 @ cp6 access for early sched_clock |
| 400 | mcr p15, 0, r0, c15, c1, 0 @ write CP access register | 400 | mcr p15, 0, r0, c15, c1, 0 @ write CP access register |
| 401 | 401 | ||
| 402 | mrc p15, 0, r0, c1, c0, 1 @ get auxiliary control reg | 402 | mrc p15, 0, r0, c1, c0, 1 @ get auxiliary control reg |