path: root/arch/parisc/include/asm
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-26 09:36:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-26 09:36:31 -0700
commit95f4838e21945b9d9718f55afeb7edc8c39858b9 (patch)
tree1efa4bd9fca0b525664c336da4dd515b7e49ddb4 /arch/parisc/include/asm
parent088d812fe97a4cc8edaed69f91511ea063b14cef (diff)
parentd96b51ec14650b490ab98e738bcc02309396e5bc (diff)
Merge branch 'parisc-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller: "This time we made the kernel- and interruption stack allocation reentrant which fixed some strange kernel crashes (specifically protection ID traps). Furthemore this patchset fixes the interrupt stack in UP and SMP configurations by using native locking instructions. And finally usage of floating point calculations on parisc were disabled in the MPILIB." * 'parisc-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: fix irq stack on UP and SMP parisc/superio: Use module_pci_driver to register driver parisc: make interrupt and interruption stack allocation reentrant parisc: show number of FPE and unaligned access handler calls in /proc/interrupts parisc: add additional parisc git tree to MAINTAINERS file parisc: use PAGE_SHIFT instead of hardcoded value 12 in pacache.S parisc: add rp5470 entry to machine database MPILIB: disable usage of floating point registers on parisc
Diffstat (limited to 'arch/parisc/include/asm')
3 files changed, 2 insertions, 27 deletions
diff --git a/arch/parisc/include/asm/assembly.h b/arch/parisc/include/asm/assembly.h
index 89fb40005e3f..0da848232344 100644
--- a/arch/parisc/include/asm/assembly.h
+++ b/arch/parisc/include/asm/assembly.h
@@ -438,7 +438,6 @@
SAVE_SP (%sr4, PT_SR4 (\regs))
SAVE_SP (%sr5, PT_SR5 (\regs))
SAVE_SP (%sr6, PT_SR6 (\regs))
- SAVE_SP (%sr7, PT_SR7 (\regs))
SAVE_CR (%cr17, PT_IASQ0(\regs))
mtctl %r0, %cr17
diff --git a/arch/parisc/include/asm/hardirq.h b/arch/parisc/include/asm/hardirq.h
index c19f7138ba48..241c34518465 100644
--- a/arch/parisc/include/asm/hardirq.h
+++ b/arch/parisc/include/asm/hardirq.h
@@ -17,17 +17,14 @@
typedef struct {
unsigned int __softirq_pending;
unsigned int kernel_stack_usage;
unsigned int irq_stack_usage;
- unsigned int irq_stack_counter;
unsigned int irq_resched_count;
unsigned int irq_call_count;
+ unsigned int irq_unaligned_count;
+ unsigned int irq_fpassist_count;
unsigned int irq_tlb_count;
} ____cacheline_aligned irq_cpustat_t;
diff --git a/arch/parisc/include/asm/processor.h b/arch/parisc/include/asm/processor.h
index cfbc43929cf6..cc2290a3cace 100644
--- a/arch/parisc/include/asm/processor.h
+++ b/arch/parisc/include/asm/processor.h
@@ -17,7 +17,6 @@
#include <asm/ptrace.h>
#include <asm/types.h>
#include <asm/percpu.h>
#endif /* __ASSEMBLY__ */
@@ -59,26 +58,6 @@
#ifndef __ASSEMBLY__
- * IRQ STACK - used for irq handler
- */
-#ifdef __KERNEL__
-#include <linux/spinlock_types.h>
-#define IRQ_STACK_SIZE (4096 << 2) /* 16k irq stack size */
-union irq_stack_union {
- unsigned long stack[IRQ_STACK_SIZE/sizeof(unsigned long)];
- raw_spinlock_t lock;
-DECLARE_PER_CPU(union irq_stack_union, irq_stack_union);
-void call_on_stack(unsigned long p1, void *func, unsigned long new_stack);
-#endif /* __KERNEL__ */
* Data detected about CPUs at boot time which is the same for all CPU's.
* HP boxes are SMP - ie identical processors.