git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
irq.c
diff --git
a/arch/i386/kernel/irq.c
b/arch/i386/kernel/irq.c
index
ea69f21
..
355dc0e
100644
(file)
--- a/
arch/i386/kernel/irq.c
+++ b/
arch/i386/kernel/irq.c
@@
-41,7
+41,6
@@
#include <asm/system.h>
#include <asm/bitops.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/bitops.h>
#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
#include <asm/delay.h>
#include <asm/desc.h>
#include <asm/irq.h>
#include <asm/delay.h>
#include <asm/desc.h>
#include <asm/irq.h>
@@
-653,7
+652,7
@@
int request_irq(unsigned int irq,
action->handler = handler;
action->flags = irqflags;
action->handler = handler;
action->flags = irqflags;
-
action->mask = 0
;
+
cpus_clear(action->mask)
;
action->name = devname;
action->next = NULL;
action->dev_id = dev_id;
action->name = devname;
action->next = NULL;
action->dev_id = dev_id;
@@
-1095,7
+1094,7
@@
void init_irq_proc (void)
int i;
/* create /proc/irq */
int i;
/* create /proc/irq */
- root_irq_dir = proc_mkdir("irq",
0
);
+ root_irq_dir = proc_mkdir("irq",
NULL
);
/* create /proc/irq/prof_cpu_mask */
entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir);
/* create /proc/irq/prof_cpu_mask */
entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir);
@@
-1117,6
+1116,10
@@
void init_irq_proc (void)
#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] __attribute__((__aligned__(THREAD_SIZE)));
static char hardirq_stack[NR_CPUS * THREAD_SIZE] __attribute__((__aligned__(THREAD_SIZE)));
static char softirq_stack[NR_CPUS * THREAD_SIZE] __attribute__((__aligned__(THREAD_SIZE)));
static char hardirq_stack[NR_CPUS * THREAD_SIZE] __attribute__((__aligned__(THREAD_SIZE)));