diff options
| author | James Bottomley <jbottomley@parallels.com> | 2011-05-22 09:04:55 +0200 |
|---|---|---|
| committer | James Bottomley <jbottomley@parallels.com> | 2011-05-22 09:04:55 +0200 |
| commit | 7fe2ac6882f74e8bd5b3891f63c09cb10aee9d03 (patch) | |
| tree | 3358215354ae27d86411963ab33c2d8f07c5e427 /arch/parisc/kernel/head.S | |
| parent | [PARISC] wire up syncfs syscall (diff) | |
| parent | [PARISC] prevent speculative re-read on cache flush (diff) | |
| download | linux-7fe2ac6882f74e8bd5b3891f63c09cb10aee9d03.tar.xz linux-7fe2ac6882f74e8bd5b3891f63c09cb10aee9d03.zip | |
Merge branch 'flushing' into for-linus
Diffstat (limited to 'arch/parisc/kernel/head.S')
| -rw-r--r-- | arch/parisc/kernel/head.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S index 145c5e4caaa0..37aabd772fbb 100644 --- a/arch/parisc/kernel/head.S +++ b/arch/parisc/kernel/head.S @@ -106,8 +106,9 @@ $bss_loop: #endif - /* Now initialize the PTEs themselves */ - ldo 0+_PAGE_KERNEL(%r0),%r3 /* Hardwired 0 phys addr start */ + /* Now initialize the PTEs themselves. We use RWX for + * everything ... it will get remapped correctly later */ + ldo 0+_PAGE_KERNEL_RWX(%r0),%r3 /* Hardwired 0 phys addr start */ ldi (1<<(KERNEL_INITIAL_ORDER-PAGE_SHIFT)),%r11 /* PFN count */ load32 PA(pg0),%r1 |