Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
3211be5c
Commit
3211be5c
authored
Oct 06, 2006
by
Paul Mackerras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PPC] Fix some irq breakage with ARCH=ppc
Signed-off-by:
Paul Mackerras
<
paulus@samba.org
>
parent
49f19ce4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
arch/ppc/kernel/time.c
arch/ppc/kernel/time.c
+1
-1
include/asm-ppc/floppy.h
include/asm-ppc/floppy.h
+3
-3
No files found.
arch/ppc/kernel/time.c
View file @
3211be5c
...
...
@@ -142,7 +142,7 @@ void timer_interrupt(struct pt_regs * regs)
while
((
next_dec
=
tb_ticks_per_jiffy
-
tb_delta
(
&
jiffy_stamp
))
<=
0
)
{
jiffy_stamp
+=
tb_ticks_per_jiffy
;
profile_tick
(
CPU_PROFILING
,
regs
);
profile_tick
(
CPU_PROFILING
);
update_process_times
(
user_mode
(
regs
));
if
(
smp_processor_id
())
...
...
include/asm-ppc/floppy.h
View file @
3211be5c
...
...
@@ -38,14 +38,14 @@ static int virtual_dma_mode;
static
int
doing_vdma
;
static
struct
fd_dma_ops
*
fd_ops
;
static
irqreturn_t
floppy_hardint
(
int
irq
,
void
*
dev_id
,
struct
pt_regs
*
regs
)
static
irqreturn_t
floppy_hardint
(
int
irq
,
void
*
dev_id
)
{
unsigned
char
st
;
int
lcount
;
char
*
lptr
;
if
(
!
doing_vdma
)
return
floppy_interrupt
(
irq
,
dev_id
,
regs
);
return
floppy_interrupt
(
irq
,
dev_id
);
st
=
1
;
...
...
@@ -69,7 +69,7 @@ static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs)
virtual_dma_residue
+=
virtual_dma_count
;
virtual_dma_count
=
0
;
doing_vdma
=
0
;
floppy_interrupt
(
irq
,
dev_id
,
regs
);
floppy_interrupt
(
irq
,
dev_id
);
return
IRQ_HANDLED
;
}
return
IRQ_HANDLED
;
...
...
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