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
1c70e566
Commit
1c70e566
authored
Sep 14, 2002
by
Anton Blanchard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ppc64: updates from Rochester
parent
d64247f3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
arch/ppc64/kernel/pci.c
arch/ppc64/kernel/pci.c
+3
-2
arch/ppc64/kernel/ppc_ksyms.c
arch/ppc64/kernel/ppc_ksyms.c
+8
-4
No files found.
arch/ppc64/kernel/pci.c
View file @
1c70e566
...
...
@@ -490,7 +490,8 @@ pcibios_init(void)
#endif
/* Cache the location of the ISA bridge (if we have one) */
if
(
ppc64_isabridge_dev
=
pci_find_class
(
PCI_CLASS_BRIDGE_ISA
<<
8
,
NULL
))
ppc64_isabridge_dev
=
pci_find_class
(
PCI_CLASS_BRIDGE_ISA
<<
8
,
NULL
);
if
(
ppc64_isabridge_dev
!=
NULL
)
printk
(
"ISA bridge at %s
\n
"
,
ppc64_isabridge_dev
->
slot_name
);
printk
(
"PCI: Probing PCI hardware done
\n
"
);
...
...
@@ -514,11 +515,11 @@ unsigned long resource_fixup(struct pci_dev * dev, struct resource * res,
void
__init
pcibios_fixup_bus
(
struct
pci_bus
*
bus
)
{
#ifndef CONFIG_PPC_ISERIES
struct
pci_controller
*
phb
=
PCI_GET_PHB_PTR
(
bus
);
struct
resource
*
res
;
int
i
;
#ifndef CONFIG_PPC_ISERIES
if
(
bus
->
parent
==
NULL
)
{
/* This is a host bridge - fill in its resources */
phb
->
bus
=
bus
;
...
...
arch/ppc64/kernel/ppc_ksyms.c
View file @
1c70e566
...
...
@@ -50,6 +50,7 @@
/* Tell string.h we don't want memcpy etc. as cpp defines */
#define EXPORT_SYMTAB_STROPS
extern
int
sys_ioctl
(
unsigned
int
fd
,
unsigned
int
cmd
,
unsigned
long
arg
);
extern
int
sys_sigreturn
(
struct
pt_regs
*
regs
);
extern
int
do_signal
(
sigset_t
*
,
struct
pt_regs
*
);
extern
int
register_ioctl32_conversion
(
unsigned
int
cmd
,
int
(
*
handler
)(
unsigned
int
,
unsigned
int
,
unsigned
long
,
struct
file
*
));
...
...
@@ -64,6 +65,7 @@ extern struct pci_dev * iSeries_veth_dev;
extern
struct
pci_dev
*
iSeries_vio_dev
;
EXPORT_SYMBOL
(
do_signal
);
EXPORT_SYMBOL
(
sys_ioctl
);
EXPORT_SYMBOL
(
sys_sigreturn
);
EXPORT_SYMBOL
(
enable_irq
);
EXPORT_SYMBOL
(
disable_irq
);
...
...
@@ -154,15 +156,17 @@ EXPORT_SYMBOL(pci_unmap_single);
EXPORT_SYMBOL
(
pci_map_sg
);
EXPORT_SYMBOL
(
pci_unmap_sg
);
#ifdef CONFIG_PPC_ISERIES
EXPORT_SYMBOL
(
iSeries_Write_Long
);
EXPORT_SYMBOL
(
iSeries_GetLocationData
);
EXPORT_SYMBOL
(
iSeries_Read_Long
);
EXPORT_SYMBOL
(
iSeries_Device_ToggleReset
);
EXPORT_SYMBOL
(
iSeries_Write_Word
);
EXPORT_SYMBOL
(
iSeries_memset_io
);
EXPORT_SYMBOL
(
iSeries_memcpy_toio
);
EXPORT_SYMBOL
(
iSeries_memcpy_fromio
);
EXPORT_SYMBOL
(
iSeries_Read_Word
);
EXPORT_SYMBOL
(
iSeries_Read_Byte
);
EXPORT_SYMBOL
(
iSeries_Read_Word
);
EXPORT_SYMBOL
(
iSeries_Read_Long
);
EXPORT_SYMBOL
(
iSeries_Write_Byte
);
EXPORT_SYMBOL
(
iSeries_Write_Word
);
EXPORT_SYMBOL
(
iSeries_Write_Long
);
#endif
/* CONFIG_PPC_ISERIES */
#ifndef CONFIG_PPC_ISERIES
EXPORT_SYMBOL
(
eeh_check_failure
);
...
...
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