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
Kirill Smelkov
linux
Commits
1ffa6844
Commit
1ffa6844
authored
Sep 27, 2004
by
Richard Russon
Browse files
Options
Browse Files
Download
Plain Diff
Merge flatcap.org:/home/flatcap/backup/bk/linux-2.6
into flatcap.org:/home/flatcap/backup/bk/ntfs-2.6
parents
bfef1166
beb0e5c2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
arch/ppc64/kernel/signal32.c
arch/ppc64/kernel/signal32.c
+1
-1
drivers/media/video/bttv-risc.c
drivers/media/video/bttv-risc.c
+3
-2
No files found.
arch/ppc64/kernel/signal32.c
View file @
1ffa6844
...
...
@@ -478,7 +478,7 @@ static long copy_siginfo_to_user32(compat_siginfo_t __user *d, siginfo_t *s)
case
__SI_TIMER
>>
16
:
err
|=
__put_user
(
s
->
si_tid
,
&
d
->
si_tid
);
err
|=
__put_user
(
s
->
si_overrun
,
&
d
->
si_overrun
);
err
|=
__put_user
(
(
u32
)(
u64
)
s
->
si_ptr
,
&
d
->
si_ptr
);
err
|=
__put_user
(
s
->
si_int
,
&
d
->
si_int
);
break
;
case
__SI_RT
>>
16
:
/* This is not generated by the kernel as of now. */
case
__SI_MESGQ
>>
16
:
...
...
drivers/media/video/bttv-risc.c
View file @
1ffa6844
...
...
@@ -125,6 +125,7 @@ bttv_risc_planar(struct bttv *btv, struct btcx_riscmem *risc,
struct
scatterlist
*
ysg
;
struct
scatterlist
*
usg
;
struct
scatterlist
*
vsg
;
int
topfield
=
(
0
==
yoffset
);
int
rc
;
/* estimate risc mem: worst case is one write per page border +
...
...
@@ -153,13 +154,13 @@ bttv_risc_planar(struct bttv *btv, struct btcx_riscmem *risc,
chroma
=
1
;
break
;
case
1
:
if
(
!
yoffset
)
if
(
topfield
)
chroma
=
(
line
&
1
)
==
0
;
else
chroma
=
(
line
&
1
)
==
1
;
break
;
case
2
:
if
(
!
yoffset
)
if
(
topfield
)
chroma
=
(
line
&
3
)
==
0
;
else
chroma
=
(
line
&
3
)
==
2
;
...
...
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