diff options
| author |   James Bottomley <jbottomley@parallels.com> | 2011-05-22 11:04:55 +0400 |
|---|---|---|
| committer | James Bottomley <jbottomley@parallels.com> | 2011-05-22 11:04:55 +0400 |
| commit | 7fe2ac6882f74e8bd5b3891f63c09cb10aee9d03 (patch) | |
| tree | 3358215354ae27d86411963ab33c2d8f07c5e427 /arch/parisc/kernel/entry.S | |
| parent | [PARISC] wire up syncfs syscall (diff) | |
| parent | [PARISC] prevent speculative re-read on cache flush (diff) | |
| download | linux-dev-7fe2ac6882f74e8bd5b3891f63c09cb10aee9d03.tar.xz linux-dev-7fe2ac6882f74e8bd5b3891f63c09cb10aee9d03.zip | |
Merge branch 'flushing' into for-linus
Diffstat (limited to 'arch/parisc/kernel/entry.S')
| -rw-r--r-- | arch/parisc/kernel/entry.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index ead8d2a1034c..6f0594439143 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S @@ -692,6 +692,9 @@ ENTRY(fault_vector_11) END(fault_vector_11) #endif + /* Fault vector is separately protected and *must* be on its own page */ + .align PAGE_SIZE +ENTRY(end_fault_vector) .import handle_interruption,code .import do_cpu_irq_mask,code |