git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
i386
/
kernel
/
irq.c
diff --git
a/arch/i386/kernel/irq.c
b/arch/i386/kernel/irq.c
index
d2daf67
..
dd2b97f
100644
(file)
--- a/
arch/i386/kernel/irq.c
+++ b/
arch/i386/kernel/irq.c
@@
-21,7
+21,7
@@
#include <asm/apic.h>
#include <asm/uaccess.h>
#include <asm/apic.h>
#include <asm/uaccess.h>
-DEFINE_PER_CPU
(irq_cpustat_t, irq_stat) ____cacheline_internodealigned_in_smp
;
+DEFINE_PER_CPU
_SHARED_ALIGNED(irq_cpustat_t, irq_stat)
;
EXPORT_PER_CPU_SYMBOL(irq_stat);
DEFINE_PER_CPU(struct pt_regs *, irq_regs);
EXPORT_PER_CPU_SYMBOL(irq_stat);
DEFINE_PER_CPU(struct pt_regs *, irq_regs);
@@
-149,15
+149,11
@@
fastcall unsigned int do_IRQ(struct pt_regs *regs)
#ifdef CONFIG_4KSTACKS
#ifdef CONFIG_4KSTACKS
-/*
- * These should really be __section__(".bss.page_aligned") as well, but
- * gcc's 3.0 and earlier don't handle that correctly.
- */
static char softirq_stack[NR_CPUS * THREAD_SIZE]
static char softirq_stack[NR_CPUS * THREAD_SIZE]
- __attribute__((__
aligned__(THREAD_SIZE
)));
+ __attribute__((__
section__(".bss.page_aligned"
)));
static char hardirq_stack[NR_CPUS * THREAD_SIZE]
static char hardirq_stack[NR_CPUS * THREAD_SIZE]
- __attribute__((__
aligned__(THREAD_SIZE
)));
+ __attribute__((__
section__(".bss.page_aligned"
)));
/*
* allocate per-cpu stacks for hardirq and for softirq processing
/*
* allocate per-cpu stacks for hardirq and for softirq processing