diff options
| author | Len Brown <len.brown@intel.com> | 2006-12-20 02:53:13 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-12-20 02:53:13 -0500 |
| commit | 9774f3384125912eb491ca77f77907324db3ed05 (patch) | |
| tree | 0bdc7486e911dd9e955b41283ee19ac74521f7bd /include/asm-sparc64 | |
| parent | 3be11c8f4f2fa194834c2e83540f34da442b8977 (diff) | |
| parent | f238085415c56618e042252894f2fcc971add645 (diff) | |
| download | kernel-crypto-9774f3384125912eb491ca77f77907324db3ed05.tar.gz kernel-crypto-9774f3384125912eb491ca77f77907324db3ed05.tar.xz kernel-crypto-9774f3384125912eb491ca77f77907324db3ed05.zip | |
merge linus into test branch
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/hw_irq.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc64/percpu.h | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/include/asm-sparc64/hw_irq.h b/include/asm-sparc64/hw_irq.h index 599b3b07345..8e44a836082 100644 --- a/include/asm-sparc64/hw_irq.h +++ b/include/asm-sparc64/hw_irq.h @@ -1,6 +1,4 @@ #ifndef __ASM_SPARC64_HW_IRQ_H #define __ASM_SPARC64_HW_IRQ_H -extern void hw_resend_irq(struct hw_interrupt_type *handler, unsigned int virt_irq); - #endif diff --git a/include/asm-sparc64/percpu.h b/include/asm-sparc64/percpu.h index ced8cbde046..0d3df76aa47 100644 --- a/include/asm-sparc64/percpu.h +++ b/include/asm-sparc64/percpu.h @@ -5,6 +5,16 @@ #ifdef CONFIG_SMP +#ifdef CONFIG_MODULES +# define PERCPU_MODULE_RESERVE 8192 +#else +# define PERCPU_MODULE_RESERVE 0 +#endif + +#define PERCPU_ENOUGH_ROOM \ + (ALIGN(__per_cpu_end - __per_cpu_start, SMP_CACHE_BYTES) + \ + PERCPU_MODULE_RESERVE) + extern void setup_per_cpu_areas(void); extern unsigned long __per_cpu_base; |