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
4efd5d18
Commit
4efd5d18
authored
Feb 13, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://namesys.com/bk/reiser3-linux-2.5-resizer-fix
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
4c5254cd
3bdd213f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
arch/i386/kernel/cpu/cpufreq/powernow-k7.c
arch/i386/kernel/cpu/cpufreq/powernow-k7.c
+1
-1
drivers/char/agp/intel-agp.c
drivers/char/agp/intel-agp.c
+8
-5
No files found.
arch/i386/kernel/cpu/cpufreq/powernow-k7.c
View file @
4efd5d18
...
...
@@ -67,7 +67,7 @@ static int mobile_vid_table[32] = {
/* divide by 10 to get FID. */
static
int
fid_codes
[
32
]
=
{
110
,
115
,
120
,
125
,
50
,
55
,
60
,
65
,
70
,
75
,
80
,
85
,
90
,
95
,
10
,
105
,
70
,
75
,
80
,
85
,
90
,
95
,
10
0
,
105
,
30
,
190
,
40
,
200
,
130
,
135
,
140
,
210
,
150
,
225
,
160
,
165
,
170
,
180
,
-
1
,
-
1
,
};
...
...
drivers/char/agp/intel-agp.c
View file @
4efd5d18
...
...
@@ -682,6 +682,14 @@ static int intel_815_configure(void)
u8
temp2
;
struct
aper_size_info_8
*
current_size
;
/* attbase - aperture base */
/* the Intel 815 chipset spec. says that bits 29-31 in the
* ATTBASE register are reserved -> try not to write them */
if
(
agp_bridge
->
gatt_bus_addr
&
INTEL_815_ATTBASE_MASK
)
{
printk
(
KERN_EMERG
"gatt bus addr too high"
);
return
-
EINVAL
;
}
current_size
=
A_SIZE_8
(
agp_bridge
->
current_size
);
/* aperture size */
...
...
@@ -692,11 +700,6 @@ static int intel_815_configure(void)
pci_read_config_dword
(
agp_bridge
->
dev
,
INTEL_APBASE
,
&
temp
);
agp_bridge
->
gart_bus_addr
=
(
temp
&
PCI_BASE_ADDRESS_MEM_MASK
);
/* attbase - aperture base */
/* the Intel 815 chipset spec. says that bits 29-31 in the
* ATTBASE register are reserved -> try not to write them */
if
(
agp_bridge
->
gatt_bus_addr
&
INTEL_815_ATTBASE_MASK
)
panic
(
"gatt bus addr too high"
);
pci_read_config_dword
(
agp_bridge
->
dev
,
INTEL_ATTBASE
,
&
addr
);
addr
&=
INTEL_815_ATTBASE_MASK
;
addr
|=
agp_bridge
->
gatt_bus_addr
;
...
...
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