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
95ab363c
Commit
95ab363c
authored
Feb 12, 2003
by
Andy Grover
Browse files
Options
Browse Files
Download
Plain Diff
Merge groveronline.com:/root/bk/linux-2.5
into groveronline.com:/root/bk/linux-acpi
parents
93e50e5e
4b17adc5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
drivers/acpi/osl.c
drivers/acpi/osl.c
+2
-2
drivers/acpi/pci_bind.c
drivers/acpi/pci_bind.c
+1
-1
No files found.
drivers/acpi/osl.c
View file @
95ab363c
...
@@ -143,9 +143,9 @@ acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr)
...
@@ -143,9 +143,9 @@ acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr)
#ifdef CONFIG_ACPI_EFI
#ifdef CONFIG_ACPI_EFI
addr
->
pointer_type
=
ACPI_PHYSICAL_POINTER
;
addr
->
pointer_type
=
ACPI_PHYSICAL_POINTER
;
if
(
efi
.
acpi20
)
if
(
efi
.
acpi20
)
addr
->
pointer
.
physical
=
(
ACPI_PHYSICAL_ADDRESS
)
virt_to_phys
(
efi
.
acpi20
);
addr
->
pointer
.
physical
=
(
acpi_physical_address
)
virt_to_phys
(
efi
.
acpi20
);
else
if
(
efi
.
acpi
)
else
if
(
efi
.
acpi
)
addr
->
pointer
.
physical
=
(
ACPI_PHYSICAL_ADDRESS
)
virt_to_phys
(
efi
.
acpi
);
addr
->
pointer
.
physical
=
(
acpi_physical_address
)
virt_to_phys
(
efi
.
acpi
);
else
{
else
{
printk
(
KERN_ERR
PREFIX
"System description tables not found
\n
"
);
printk
(
KERN_ERR
PREFIX
"System description tables not found
\n
"
);
return
AE_NOT_FOUND
;
return
AE_NOT_FOUND
;
...
...
drivers/acpi/pci_bind.c
View file @
95ab363c
...
@@ -185,7 +185,7 @@ acpi_pci_bind (
...
@@ -185,7 +185,7 @@ acpi_pci_bind (
*/
*/
data
->
dev
=
pci_find_slot
(
data
->
id
.
bus
,
PCI_DEVFN
(
data
->
id
.
device
,
data
->
id
.
function
));
data
->
dev
=
pci_find_slot
(
data
->
id
.
bus
,
PCI_DEVFN
(
data
->
id
.
device
,
data
->
id
.
function
));
if
(
!
data
->
dev
)
{
if
(
!
data
->
dev
)
{
ACPI_DEBUG_PRINT
((
ACPI_DB_
WARN
,
ACPI_DEBUG_PRINT
((
ACPI_DB_
INFO
,
"Device %02x:%02x:%02x.%02x not present in PCI namespace
\n
"
,
"Device %02x:%02x:%02x.%02x not present in PCI namespace
\n
"
,
data
->
id
.
segment
,
data
->
id
.
bus
,
data
->
id
.
segment
,
data
->
id
.
bus
,
data
->
id
.
device
,
data
->
id
.
function
));
data
->
id
.
device
,
data
->
id
.
function
));
...
...
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