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
66e7a091
Commit
66e7a091
authored
Nov 25, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/davem/BK/sparc-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
parents
7190053f
e2fb7cf9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
7 deletions
+16
-7
arch/sparc/kernel/time.c
arch/sparc/kernel/time.c
+9
-0
drivers/video/igafb.c
drivers/video/igafb.c
+7
-7
No files found.
arch/sparc/kernel/time.c
View file @
66e7a091
...
@@ -472,6 +472,15 @@ extern __inline__ unsigned long do_gettimeoffset(void)
...
@@ -472,6 +472,15 @@ extern __inline__ unsigned long do_gettimeoffset(void)
return
(
*
master_l10_counter
>>
10
)
&
0x1fffff
;
return
(
*
master_l10_counter
>>
10
)
&
0x1fffff
;
}
}
/*
* Returns nanoseconds
* XXX This is a suboptimal implementation.
*/
unsigned
long
long
sched_clock
(
void
)
{
return
(
unsigned
long
long
)
jiffies
*
(
1000000000
/
HZ
);
}
/* Ok, my cute asm atomicity trick doesn't work anymore.
/* Ok, my cute asm atomicity trick doesn't work anymore.
* There are just too many variables that need to be protected
* There are just too many variables that need to be protected
* now (both members of xtime, wall_jiffies, et al.)
* now (both members of xtime, wall_jiffies, et al.)
...
...
drivers/video/igafb.c
View file @
66e7a091
...
@@ -70,8 +70,8 @@ struct fb_info fb_info;
...
@@ -70,8 +70,8 @@ struct fb_info fb_info;
struct
fb_fix_screeninfo
igafb_fix
__initdata
=
{
struct
fb_fix_screeninfo
igafb_fix
__initdata
=
{
.
id
=
"IGA 1682"
,
.
id
=
"IGA 1682"
,
.
type
=
FB_TYPE_PACKED_PIXELS
;
.
type
=
FB_TYPE_PACKED_PIXELS
,
.
mmio_len
=
1000
;
.
mmio_len
=
1000
};
};
struct
fb_var_screeninfo
default_var
=
{
struct
fb_var_screeninfo
default_var
=
{
...
@@ -149,7 +149,7 @@ struct fb_var_screeninfo default_var_1280x1024 __initdata = {
...
@@ -149,7 +149,7 @@ struct fb_var_screeninfo default_var_1280x1024 __initdata = {
.
xres
=
1280
,
.
xres
=
1280
,
.
yres
=
1024
,
.
yres
=
1024
,
.
xres_virtual
=
1280
,
.
xres_virtual
=
1280
,
.
yres_virt
au
l
=
1024
,
.
yres_virt
ua
l
=
1024
,
.
bits_per_pixel
=
8
,
.
bits_per_pixel
=
8
,
.
red
=
{
0
,
8
,
0
},
.
red
=
{
0
,
8
,
0
},
.
green
=
{
0
,
8
,
0
},
.
green
=
{
0
,
8
,
0
},
...
@@ -300,17 +300,17 @@ static int igafb_setcolreg(unsigned regno, unsigned red, unsigned green,
...
@@ -300,17 +300,17 @@ static int igafb_setcolreg(unsigned regno, unsigned red, unsigned green,
if
(
regno
<
16
)
{
if
(
regno
<
16
)
{
switch
(
info
->
var
.
bits_per_pixel
)
{
switch
(
info
->
var
.
bits_per_pixel
)
{
case
16
:
case
16
:
info
->
pseudo_palette
[
regno
]
=
((
u16
*
)(
info
->
pseudo_palette
))
[
regno
]
=
(
regno
<<
10
)
|
(
regno
<<
5
)
|
regno
;
(
regno
<<
10
)
|
(
regno
<<
5
)
|
regno
;
break
;
break
;
case
24
:
case
24
:
info
->
pseudo_palette
[
regno
]
=
((
u32
*
)(
info
->
pseudo_palette
))
[
regno
]
=
(
regno
<<
16
)
|
(
regno
<<
8
)
|
regno
;
(
regno
<<
16
)
|
(
regno
<<
8
)
|
regno
;
break
;
break
;
case
32
:
case
32
:
{
int
i
;
{
int
i
;
i
=
(
regno
<<
8
)
|
regno
;
i
=
(
regno
<<
8
)
|
regno
;
info
->
pseudo_palette
[
regno
]
=
(
i
<<
16
)
|
i
;
((
u32
*
)(
info
->
pseudo_palette
))
[
regno
]
=
(
i
<<
16
)
|
i
;
}
}
break
;
break
;
}
}
...
@@ -359,7 +359,7 @@ static int __init iga_init(struct fb_info *info, struct iga_par *par)
...
@@ -359,7 +359,7 @@ static int __init iga_init(struct fb_info *info, struct iga_par *par)
info
->
fbops
=
&
igafb_ops
;
info
->
fbops
=
&
igafb_ops
;
info
->
flags
=
FBINFO_FLAG_DEFAULT
;
info
->
flags
=
FBINFO_FLAG_DEFAULT
;
fb_alloc_cmap
(
info
->
cmap
,
video_cmap_len
,
0
);
fb_alloc_cmap
(
&
info
->
cmap
,
video_cmap_len
,
0
);
if
(
register_framebuffer
(
info
)
<
0
)
if
(
register_framebuffer
(
info
)
<
0
)
return
0
;
return
0
;
...
...
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