Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
756e7104
Commit
756e7104
authored
Nov 09, 2005
by
Stephen Rothwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
powerpc: merge irq.c
Signed-off-by:
Stephen Rothwell
<
sfr@canb.auug.org.au
>
parent
d4be4f37
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
103 additions
and
202 deletions
+103
-202
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/Makefile
+1
-1
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/irq.c
+93
-30
arch/powerpc/platforms/powermac/pic.c
arch/powerpc/platforms/powermac/pic.c
+3
-0
arch/ppc/kernel/Makefile
arch/ppc/kernel/Makefile
+2
-3
arch/ppc/kernel/irq.c
arch/ppc/kernel/irq.c
+0
-165
arch/ppc/kernel/ppc_ksyms.c
arch/ppc/kernel/ppc_ksyms.c
+0
-1
arch/ppc/platforms/pmac_pic.c
arch/ppc/platforms/pmac_pic.c
+3
-0
arch/ppc64/kernel/Makefile
arch/ppc64/kernel/Makefile
+1
-1
include/asm-powerpc/irq.h
include/asm-powerpc/irq.h
+0
-1
No files found.
arch/powerpc/kernel/Makefile
View file @
756e7104
...
@@ -11,7 +11,7 @@ CFLAGS_btext.o += -fPIC
...
@@ -11,7 +11,7 @@ CFLAGS_btext.o += -fPIC
endif
endif
obj-y
:=
semaphore.o cputable.o ptrace.o syscalls.o
\
obj-y
:=
semaphore.o cputable.o ptrace.o syscalls.o
\
signal_32.o pmc.o
irq.o
signal_32.o pmc.o
obj-$(CONFIG_PPC64)
+=
setup_64.o binfmt_elf32.o sys_ppc32.o
\
obj-$(CONFIG_PPC64)
+=
setup_64.o binfmt_elf32.o sys_ppc32.o
\
signal_64.o ptrace32.o systbl.o
signal_64.o ptrace32.o systbl.o
obj-$(CONFIG_ALTIVEC)
+=
vecemu.o vector.o
obj-$(CONFIG_ALTIVEC)
+=
vecemu.o vector.o
...
...
arch/p
pc64
/kernel/irq.c
→
arch/p
owerpc
/kernel/irq.c
View file @
756e7104
...
@@ -5,8 +5,8 @@
...
@@ -5,8 +5,8 @@
* Copyright (C) 1992 Linus Torvalds
* Copyright (C) 1992 Linus Torvalds
* Adapted from arch/i386 by Gary Thomas
* Adapted from arch/i386 by Gary Thomas
* Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)
* Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)
* Updated and modified by Cort Dougan
(cort@cs.nmt.edu)
* Updated and modified by Cort Dougan
<cort@fsmlabs.com>
* Copyright (C) 1996 Cort Dougan
* Copyright (C) 1996
-2001
Cort Dougan
* Adapted for Power Macintosh by Paul Mackerras
* Adapted for Power Macintosh by Paul Mackerras
* Copyright (C) 1996 Paul Mackerras (paulus@cs.anu.edu.au)
* Copyright (C) 1996 Paul Mackerras (paulus@cs.anu.edu.au)
* Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
* Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
...
@@ -21,6 +21,14 @@
...
@@ -21,6 +21,14 @@
* instead of just grabbing them. Thus setups with different IRQ numbers
* instead of just grabbing them. Thus setups with different IRQ numbers
* shouldn't result in any weird surprises, and installing new handlers
* shouldn't result in any weird surprises, and installing new handlers
* should be easier.
* should be easier.
*
* The MPC8xx has an interrupt mask in the SIU. If a bit is set, the
* interrupt is _enabled_. As expected, IRQ0 is bit 0 in the 32-bit
* mask register (of which only 16 are defined), hence the weird shifting
* and complement of the cached_irq_mask. I want to be able to stuff
* this right into the SIU SMASK register.
* Many of the prep/chrp functions are conditional compiled on CONFIG_8xx
* to reduce code space and undefined function references.
*/
*/
#include <linux/errno.h>
#include <linux/errno.h>
...
@@ -29,6 +37,7 @@
...
@@ -29,6 +37,7 @@
#include <linux/kernel_stat.h>
#include <linux/kernel_stat.h>
#include <linux/signal.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/sched.h>
#include <linux/ptrace.h>
#include <linux/ioport.h>
#include <linux/ioport.h>
#include <linux/interrupt.h>
#include <linux/interrupt.h>
#include <linux/timex.h>
#include <linux/timex.h>
...
@@ -40,9 +49,13 @@
...
@@ -40,9 +49,13 @@
#include <linux/irq.h>
#include <linux/irq.h>
#include <linux/proc_fs.h>
#include <linux/proc_fs.h>
#include <linux/random.h>
#include <linux/random.h>
#include <linux/kallsyms.h>
#include <linux/seq_file.h>
#include <linux/cpumask.h>
#include <linux/profile.h>
#include <linux/profile.h>
#include <linux/bitops.h>
#include <linux/bitops.h>
#ifdef CONFIG_PPC64
#include <linux/kallsyms.h>
#endif
#include <asm/uaccess.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/system.h>
...
@@ -52,35 +65,54 @@
...
@@ -52,35 +65,54 @@
#include <asm/cache.h>
#include <asm/cache.h>
#include <asm/prom.h>
#include <asm/prom.h>
#include <asm/ptrace.h>
#include <asm/ptrace.h>
#include <asm/iseries/it_lp_queue.h>
#include <asm/machdep.h>
#include <asm/machdep.h>
#ifdef CONFIG_PPC64
#include <asm/iseries/it_lp_queue.h>
#include <asm/paca.h>
#include <asm/paca.h>
#endif
#ifdef CONFIG_SMP
static
int
ppc_spurious_interrupts
;
extern
void
iSeries_smp_message_recv
(
struct
pt_regs
*
);
#if defined(CONFIG_PPC_ISERIES) && defined(CONFIG_SMP)
extern
void
iSeries_smp_message_recv
(
struct
pt_regs
*
);
#endif
#ifdef CONFIG_PPC32
#define NR_MASK_WORDS ((NR_IRQS + 31) / 32)
unsigned
long
ppc_cached_irq_mask
[
NR_MASK_WORDS
];
atomic_t
ppc_n_lost_interrupts
;
#ifdef CONFIG_TAU_INT
extern
int
tau_initialized
;
extern
int
tau_interrupts
(
int
);
#endif
#if defined(CONFIG_SMP) && !defined(CONFIG_PPC_MERGE)
extern
atomic_t
ipi_recv
;
extern
atomic_t
ipi_sent
;
#endif
#endif
#endif
/* CONFIG_PPC32 */
extern
irq_desc_t
irq_desc
[
NR_IRQS
];
#ifdef CONFIG_PPC64
EXPORT_SYMBOL
(
irq_desc
);
EXPORT_SYMBOL
(
irq_desc
);
int
distribute_irqs
=
1
;
int
distribute_irqs
=
1
;
int
__irq_offset_value
;
int
__irq_offset_value
;
int
ppc_spurious_interrupts
;
u64
ppc64_interrupt_controller
;
u64
ppc64_interrupt_controller
;
#endif
/* CONFIG_PPC64 */
int
show_interrupts
(
struct
seq_file
*
p
,
void
*
v
)
int
show_interrupts
(
struct
seq_file
*
p
,
void
*
v
)
{
{
int
i
=
*
(
loff_t
*
)
v
,
j
;
int
i
=
*
(
loff_t
*
)
v
,
j
;
struct
irqaction
*
action
;
struct
irqaction
*
action
;
irq_desc_t
*
desc
;
irq_desc_t
*
desc
;
unsigned
long
flags
;
unsigned
long
flags
;
if
(
i
==
0
)
{
if
(
i
==
0
)
{
seq_printf
(
p
,
" "
);
seq_puts
(
p
,
" "
);
for
(
j
=
0
;
j
<
NR_CPUS
;
j
++
)
{
for_each_online_cpu
(
j
)
if
(
cpu_online
(
j
))
seq_printf
(
p
,
"CPU%d "
,
j
);
seq_printf
(
p
,
"CPU%d "
,
j
);
}
seq_putc
(
p
,
'\n'
);
seq_putc
(
p
,
'\n'
);
}
}
...
@@ -92,26 +124,41 @@ int show_interrupts(struct seq_file *p, void *v)
...
@@ -92,26 +124,41 @@ int show_interrupts(struct seq_file *p, void *v)
goto
skip
;
goto
skip
;
seq_printf
(
p
,
"%3d: "
,
i
);
seq_printf
(
p
,
"%3d: "
,
i
);
#ifdef CONFIG_SMP
#ifdef CONFIG_SMP
for
(
j
=
0
;
j
<
NR_CPUS
;
j
++
)
{
for_each_online_cpu
(
j
)
if
(
cpu_online
(
j
))
seq_printf
(
p
,
"%10u "
,
kstat_cpu
(
j
).
irqs
[
i
]);
seq_printf
(
p
,
"%10u "
,
kstat_cpu
(
j
).
irqs
[
i
]);
}
#else
#else
seq_printf
(
p
,
"%10u "
,
kstat_irqs
(
i
));
seq_printf
(
p
,
"%10u "
,
kstat_irqs
(
i
));
#endif
/* CONFIG_SMP */
#endif
/* CONFIG_SMP */
if
(
desc
->
handler
)
if
(
desc
->
handler
)
seq_printf
(
p
,
" %s "
,
desc
->
handler
->
typename
);
seq_printf
(
p
,
" %s "
,
desc
->
handler
->
typename
);
else
else
seq_p
rintf
(
p
,
" None "
);
seq_p
uts
(
p
,
" None "
);
seq_printf
(
p
,
"%s"
,
(
desc
->
status
&
IRQ_LEVEL
)
?
"Level "
:
"Edge "
);
seq_printf
(
p
,
"%s"
,
(
desc
->
status
&
IRQ_LEVEL
)
?
"Level "
:
"Edge "
);
seq_printf
(
p
,
" %s"
,
action
->
name
);
seq_printf
(
p
,
" %s"
,
action
->
name
);
for
(
action
=
action
->
next
;
action
;
action
=
action
->
next
)
for
(
action
=
action
->
next
;
action
;
action
=
action
->
next
)
seq_printf
(
p
,
", %s"
,
action
->
name
);
seq_printf
(
p
,
", %s"
,
action
->
name
);
seq_putc
(
p
,
'\n'
);
seq_putc
(
p
,
'\n'
);
skip:
skip:
spin_unlock_irqrestore
(
&
desc
->
lock
,
flags
);
spin_unlock_irqrestore
(
&
desc
->
lock
,
flags
);
}
else
if
(
i
==
NR_IRQS
)
}
else
if
(
i
==
NR_IRQS
)
{
#ifdef CONFIG_PPC32
#ifdef CONFIG_TAU_INT
if
(
tau_initialized
){
seq_puts
(
p
,
"TAU: "
);
for
(
j
=
0
;
j
<
NR_CPUS
;
j
++
)
if
(
cpu_online
(
j
))
seq_printf
(
p
,
"%10u "
,
tau_interrupts
(
j
));
seq_puts
(
p
,
" PowerPC Thermal Assist (cpu temp)
\n
"
);
}
#endif
#if defined(CONFIG_SMP) && !defined(CONFIG_PPC_MERGE)
/* should this be per processor send/receive? */
seq_printf
(
p
,
"IPI (recv/sent): %10u/%u
\n
"
,
atomic_read
(
&
ipi_recv
),
atomic_read
(
&
ipi_sent
));
#endif
#endif
/* CONFIG_PPC32 */
seq_printf
(
p
,
"BAD: %10u
\n
"
,
ppc_spurious_interrupts
);
seq_printf
(
p
,
"BAD: %10u
\n
"
,
ppc_spurious_interrupts
);
}
return
0
;
return
0
;
}
}
...
@@ -211,6 +258,13 @@ void do_IRQ(struct pt_regs *regs)
...
@@ -211,6 +258,13 @@ void do_IRQ(struct pt_regs *regs)
}
}
#endif
#endif
/*
* Every platform is required to implement ppc_md.get_irq.
* This function will either return an irq number or -1 to
* indicate there are no more pending.
* The value -2 is for buggy hardware and means that this IRQ
* has already been handled. -- Tom
*/
irq
=
ppc_md
.
get_irq
(
regs
);
irq
=
ppc_md
.
get_irq
(
regs
);
if
(
irq
>=
0
)
{
if
(
irq
>=
0
)
{
...
@@ -229,15 +283,19 @@ void do_IRQ(struct pt_regs *regs)
...
@@ -229,15 +283,19 @@ void do_IRQ(struct pt_regs *regs)
#endif
#endif
__do_IRQ
(
irq
,
regs
);
__do_IRQ
(
irq
,
regs
);
}
else
}
else
#ifdef CONFIG_PPC32
if
(
irq
!=
-
2
)
#endif
/* That's not SMP safe ... but who cares ? */
/* That's not SMP safe ... but who cares ? */
ppc_spurious_interrupts
++
;
ppc_spurious_interrupts
++
;
irq_exit
();
irq_exit
();
}
}
#endif
/* CONFIG_PPC_ISERIES */
#endif
/* CONFIG_PPC_ISERIES */
void
__init
init_IRQ
(
void
)
void
__init
init_IRQ
(
void
)
{
{
#ifdef CONFIG_PPC64
static
int
once
=
0
;
static
int
once
=
0
;
if
(
once
)
if
(
once
)
...
@@ -245,10 +303,14 @@ void __init init_IRQ(void)
...
@@ -245,10 +303,14 @@ void __init init_IRQ(void)
once
++
;
once
++
;
#endif
ppc_md
.
init_IRQ
();
ppc_md
.
init_IRQ
();
#ifdef CONFIG_PPC64
irq_ctx_init
();
irq_ctx_init
();
#endif
}
}
#ifdef CONFIG_PPC64
#ifndef CONFIG_PPC_ISERIES
#ifndef CONFIG_PPC_ISERIES
/*
/*
* Virtual IRQ mapping code, used on systems with XICS interrupt controllers.
* Virtual IRQ mapping code, used on systems with XICS interrupt controllers.
...
@@ -413,3 +475,4 @@ static int __init setup_noirqdistrib(char *str)
...
@@ -413,3 +475,4 @@ static int __init setup_noirqdistrib(char *str)
}
}
__setup
(
"noirqdistrib"
,
setup_noirqdistrib
);
__setup
(
"noirqdistrib"
,
setup_noirqdistrib
);
#endif
/* CONFIG_PPC64 */
arch/powerpc/platforms/powermac/pic.c
View file @
756e7104
...
@@ -74,6 +74,9 @@ static DEFINE_SPINLOCK(pmac_pic_lock);
...
@@ -74,6 +74,9 @@ static DEFINE_SPINLOCK(pmac_pic_lock);
#define GATWICK_IRQ_POOL_SIZE 10
#define GATWICK_IRQ_POOL_SIZE 10
static
struct
interrupt_info
gatwick_int_pool
[
GATWICK_IRQ_POOL_SIZE
];
static
struct
interrupt_info
gatwick_int_pool
[
GATWICK_IRQ_POOL_SIZE
];
#define NR_MASK_WORDS ((NR_IRQS + 31) / 32)
static
unsigned
long
ppc_lost_interrupts
[
NR_MASK_WORDS
];
/*
/*
* Mark an irq as "lost". This is only used on the pmac
* Mark an irq as "lost". This is only used on the pmac
* since it can lose interrupts (see pmac_set_irq_mask).
* since it can lose interrupts (see pmac_set_irq_mask).
...
...
arch/ppc/kernel/Makefile
View file @
756e7104
...
@@ -12,7 +12,7 @@ extra-$(CONFIG_6xx) += idle_6xx.o
...
@@ -12,7 +12,7 @@ extra-$(CONFIG_6xx) += idle_6xx.o
extra-$(CONFIG_POWER4)
+=
idle_power4.o
extra-$(CONFIG_POWER4)
+=
idle_power4.o
extra-y
+=
vmlinux.lds
extra-y
+=
vmlinux.lds
obj-y
:=
entry.o traps.o i
rq.o i
dle.o time.o misc.o
\
obj-y
:=
entry.o traps.o idle.o time.o misc.o
\
process.o align.o
\
process.o align.o
\
setup.o
\
setup.o
\
ppc_htab.o
ppc_htab.o
...
@@ -38,8 +38,7 @@ endif
...
@@ -38,8 +38,7 @@ endif
# These are here while we do the architecture merge
# These are here while we do the architecture merge
else
else
obj-y
:=
irq.o idle.o
\
obj-y
:=
idle.o align.o
align.o
obj-$(CONFIG_6xx)
+=
l2cr.o cpu_setup_6xx.o
obj-$(CONFIG_6xx)
+=
l2cr.o cpu_setup_6xx.o
obj-$(CONFIG_SOFTWARE_SUSPEND)
+=
swsusp.o
obj-$(CONFIG_SOFTWARE_SUSPEND)
+=
swsusp.o
obj-$(CONFIG_MODULES)
+=
module.o
obj-$(CONFIG_MODULES)
+=
module.o
...
...
arch/ppc/kernel/irq.c
deleted
100644 → 0
View file @
d4be4f37
/*
* arch/ppc/kernel/irq.c
*
* Derived from arch/i386/kernel/irq.c
* Copyright (C) 1992 Linus Torvalds
* Adapted from arch/i386 by Gary Thomas
* Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)
* Updated and modified by Cort Dougan <cort@fsmlabs.com>
* Copyright (C) 1996-2001 Cort Dougan
* Adapted for Power Macintosh by Paul Mackerras
* Copyright (C) 1996 Paul Mackerras (paulus@cs.anu.edu.au)
* Amiga/APUS changes by Jesper Skov (jskov@cygnus.co.uk).
*
* This file contains the code used by various IRQ handling routines:
* asking for different IRQ's should be done through these routines
* instead of just grabbing them. Thus setups with different IRQ numbers
* shouldn't result in any weird surprises, and installing new handlers
* should be easier.
*
* The MPC8xx has an interrupt mask in the SIU. If a bit is set, the
* interrupt is _enabled_. As expected, IRQ0 is bit 0 in the 32-bit
* mask register (of which only 16 are defined), hence the weird shifting
* and complement of the cached_irq_mask. I want to be able to stuff
* this right into the SIU SMASK register.
* Many of the prep/chrp functions are conditional compiled on CONFIG_8xx
* to reduce code space and undefined function references.
*/
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/threads.h>
#include <linux/kernel_stat.h>
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/ptrace.h>
#include <linux/ioport.h>
#include <linux/interrupt.h>
#include <linux/timex.h>
#include <linux/config.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/delay.h>
#include <linux/irq.h>
#include <linux/proc_fs.h>
#include <linux/random.h>
#include <linux/seq_file.h>
#include <linux/cpumask.h>
#include <linux/profile.h>
#include <linux/bitops.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/io.h>
#include <asm/pgtable.h>
#include <asm/irq.h>
#include <asm/cache.h>
#include <asm/prom.h>
#include <asm/ptrace.h>
#include <asm/machdep.h>
#define NR_MASK_WORDS ((NR_IRQS + 31) / 32)
extern
atomic_t
ipi_recv
;
extern
atomic_t
ipi_sent
;
#define MAXCOUNT 10000000
int
ppc_spurious_interrupts
=
0
;
struct
irqaction
*
ppc_irq_action
[
NR_IRQS
];
unsigned
long
ppc_cached_irq_mask
[
NR_MASK_WORDS
];
unsigned
long
ppc_lost_interrupts
[
NR_MASK_WORDS
];
atomic_t
ppc_n_lost_interrupts
;
#ifdef CONFIG_TAU_INT
extern
int
tau_initialized
;
extern
int
tau_interrupts
(
int
);
#endif
int
show_interrupts
(
struct
seq_file
*
p
,
void
*
v
)
{
int
i
=
*
(
loff_t
*
)
v
,
j
;
struct
irqaction
*
action
;
unsigned
long
flags
;
if
(
i
==
0
)
{
seq_puts
(
p
,
" "
);
for
(
j
=
0
;
j
<
NR_CPUS
;
j
++
)
if
(
cpu_online
(
j
))
seq_printf
(
p
,
"CPU%d "
,
j
);
seq_putc
(
p
,
'\n'
);
}
if
(
i
<
NR_IRQS
)
{
spin_lock_irqsave
(
&
irq_desc
[
i
].
lock
,
flags
);
action
=
irq_desc
[
i
].
action
;
if
(
!
action
||
!
action
->
handler
)
goto
skip
;
seq_printf
(
p
,
"%3d: "
,
i
);
#ifdef CONFIG_SMP
for
(
j
=
0
;
j
<
NR_CPUS
;
j
++
)
if
(
cpu_online
(
j
))
seq_printf
(
p
,
"%10u "
,
kstat_cpu
(
j
).
irqs
[
i
]);
#else
seq_printf
(
p
,
"%10u "
,
kstat_irqs
(
i
));
#endif
/* CONFIG_SMP */
if
(
irq_desc
[
i
].
handler
)
seq_printf
(
p
,
" %s "
,
irq_desc
[
i
].
handler
->
typename
);
else
seq_puts
(
p
,
" None "
);
seq_printf
(
p
,
"%s"
,
(
irq_desc
[
i
].
status
&
IRQ_LEVEL
)
?
"Level "
:
"Edge "
);
seq_printf
(
p
,
" %s"
,
action
->
name
);
for
(
action
=
action
->
next
;
action
;
action
=
action
->
next
)
seq_printf
(
p
,
", %s"
,
action
->
name
);
seq_putc
(
p
,
'\n'
);
skip:
spin_unlock_irqrestore
(
&
irq_desc
[
i
].
lock
,
flags
);
}
else
if
(
i
==
NR_IRQS
)
{
#ifdef CONFIG_TAU_INT
if
(
tau_initialized
){
seq_puts
(
p
,
"TAU: "
);
for
(
j
=
0
;
j
<
NR_CPUS
;
j
++
)
if
(
cpu_online
(
j
))
seq_printf
(
p
,
"%10u "
,
tau_interrupts
(
j
));
seq_puts
(
p
,
" PowerPC Thermal Assist (cpu temp)
\n
"
);
}
#endif
#if defined(CONFIG_SMP) && !defined(CONFIG_PPC_MERGE)
/* should this be per processor send/receive? */
seq_printf
(
p
,
"IPI (recv/sent): %10u/%u
\n
"
,
atomic_read
(
&
ipi_recv
),
atomic_read
(
&
ipi_sent
));
#endif
seq_printf
(
p
,
"BAD: %10u
\n
"
,
ppc_spurious_interrupts
);
}
return
0
;
}
void
do_IRQ
(
struct
pt_regs
*
regs
)
{
int
irq
,
first
=
1
;
irq_enter
();
/*
* Every platform is required to implement ppc_md.get_irq.
* This function will either return an irq number or -1 to
* indicate there are no more pending. But the first time
* through the loop this means there wasn't and IRQ pending.
* The value -2 is for buggy hardware and means that this IRQ
* has already been handled. -- Tom
*/
while
((
irq
=
ppc_md
.
get_irq
(
regs
))
>=
0
)
{
__do_IRQ
(
irq
,
regs
);
first
=
0
;
}
if
(
irq
!=
-
2
&&
first
)
/* That's not SMP safe ... but who cares ? */
ppc_spurious_interrupts
++
;
irq_exit
();
}
void
__init
init_IRQ
(
void
)
{
ppc_md
.
init_IRQ
();
}
arch/ppc/kernel/ppc_ksyms.c
View file @
756e7104
...
@@ -78,7 +78,6 @@ EXPORT_SYMBOL(program_check_exception);
...
@@ -78,7 +78,6 @@ EXPORT_SYMBOL(program_check_exception);
EXPORT_SYMBOL
(
single_step_exception
);
EXPORT_SYMBOL
(
single_step_exception
);
EXPORT_SYMBOL
(
sys_sigreturn
);
EXPORT_SYMBOL
(
sys_sigreturn
);
EXPORT_SYMBOL
(
ppc_n_lost_interrupts
);
EXPORT_SYMBOL
(
ppc_n_lost_interrupts
);
EXPORT_SYMBOL
(
ppc_lost_interrupts
);
EXPORT_SYMBOL
(
ISA_DMA_THRESHOLD
);
EXPORT_SYMBOL
(
ISA_DMA_THRESHOLD
);
EXPORT_SYMBOL
(
DMA_MODE_READ
);
EXPORT_SYMBOL
(
DMA_MODE_READ
);
...
...
arch/ppc/platforms/pmac_pic.c
View file @
756e7104
...
@@ -75,6 +75,9 @@ static DEFINE_SPINLOCK(pmac_pic_lock);
...
@@ -75,6 +75,9 @@ static DEFINE_SPINLOCK(pmac_pic_lock);
#define GATWICK_IRQ_POOL_SIZE 10
#define GATWICK_IRQ_POOL_SIZE 10
static
struct
interrupt_info
gatwick_int_pool
[
GATWICK_IRQ_POOL_SIZE
];
static
struct
interrupt_info
gatwick_int_pool
[
GATWICK_IRQ_POOL_SIZE
];
#define NR_MASK_WORDS ((NR_IRQS + 31) / 32)
static
unsigned
long
ppc_lost_interrupts
[
NR_MASK_WORDS
];
/*
/*
* Mark an irq as "lost". This is only used on the pmac
* Mark an irq as "lost". This is only used on the pmac
* since it can lose interrupts (see pmac_set_irq_mask).
* since it can lose interrupts (see pmac_set_irq_mask).
...
...
arch/ppc64/kernel/Makefile
View file @
756e7104
...
@@ -11,7 +11,7 @@ obj-y := misc.o prom.o
...
@@ -11,7 +11,7 @@ obj-y := misc.o prom.o
endif
endif
obj-y
+=
i
rq.o i
dle.o dma.o
\
obj-y
+=
idle.o dma.o
\
align.o pacaData.o
\
align.o pacaData.o
\
udbg.o ioctl32.o
\
udbg.o ioctl32.o
\
rtc.o
\
rtc.o
\
...
...
include/asm-powerpc/irq.h
View file @
756e7104
...
@@ -429,7 +429,6 @@ extern u64 ppc64_interrupt_controller;
...
@@ -429,7 +429,6 @@ extern u64 ppc64_interrupt_controller;
#define NR_MASK_WORDS ((NR_IRQS + 31) / 32)
#define NR_MASK_WORDS ((NR_IRQS + 31) / 32)
/* pedantic: these are long because they are used with set_bit --RR */
/* pedantic: these are long because they are used with set_bit --RR */
extern
unsigned
long
ppc_cached_irq_mask
[
NR_MASK_WORDS
];
extern
unsigned
long
ppc_cached_irq_mask
[
NR_MASK_WORDS
];
extern
unsigned
long
ppc_lost_interrupts
[
NR_MASK_WORDS
];
extern
atomic_t
ppc_n_lost_interrupts
;
extern
atomic_t
ppc_n_lost_interrupts
;
#define virt_irq_create_mapping(x) (x)
#define virt_irq_create_mapping(x) (x)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment