diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/Kconfig | 5 | ||||
-rw-r--r-- | arch/powerpc/kernel/pci_64.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/ps3/Makefile | 3 | ||||
-rw-r--r-- | arch/powerpc/platforms/ps3/interrupt.c | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index b268c417c0bf..d6abe495c6b0 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -526,12 +526,15 @@ config PPC_IBM_CELL_BLADE | |||
526 | select UDBG_RTAS_CONSOLE | 526 | select UDBG_RTAS_CONSOLE |
527 | 527 | ||
528 | config PPC_PS3 | 528 | config PPC_PS3 |
529 | bool "Sony PS3" | 529 | bool "Sony PS3 (incomplete)" |
530 | depends on PPC_MULTIPLATFORM && PPC64 | 530 | depends on PPC_MULTIPLATFORM && PPC64 |
531 | select PPC_CELL | 531 | select PPC_CELL |
532 | help | 532 | help |
533 | This option enables support for the Sony PS3 game console | 533 | This option enables support for the Sony PS3 game console |
534 | and other platforms using the PS3 hypervisor. | 534 | and other platforms using the PS3 hypervisor. |
535 | Support for this platform is not yet complete, so | ||
536 | enabling this will not result in a bootable kernel on a | ||
537 | PS3 system. | ||
535 | 538 | ||
536 | config PPC_NATIVE | 539 | config PPC_NATIVE |
537 | bool | 540 | bool |
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c index 73c59ec49120..01f18c683407 100644 --- a/arch/powerpc/kernel/pci_64.c +++ b/arch/powerpc/kernel/pci_64.c | |||
@@ -1430,7 +1430,7 @@ long sys_pciconfig_iobase(long which, unsigned long in_bus, | |||
1430 | 1430 | ||
1431 | for (ln = pci_root_buses.next; ln != &pci_root_buses; ln = ln->next) { | 1431 | for (ln = pci_root_buses.next; ln != &pci_root_buses; ln = ln->next) { |
1432 | bus = pci_bus_b(ln); | 1432 | bus = pci_bus_b(ln); |
1433 | if (in_bus >= bus->number && in_bus < (bus->number + bus->subordinate)) | 1433 | if (in_bus >= bus->number && in_bus <= bus->subordinate) |
1434 | break; | 1434 | break; |
1435 | bus = NULL; | 1435 | bus = NULL; |
1436 | } | 1436 | } |
diff --git a/arch/powerpc/platforms/ps3/Makefile b/arch/powerpc/platforms/ps3/Makefile index 3757cfabc8ce..1994904f580f 100644 --- a/arch/powerpc/platforms/ps3/Makefile +++ b/arch/powerpc/platforms/ps3/Makefile | |||
@@ -1,4 +1,5 @@ | |||
1 | obj-y += setup.o mm.o smp.o time.o hvcall.o htab.o repository.o | 1 | obj-y += setup.o mm.o time.o hvcall.o htab.o repository.o |
2 | obj-y += interrupt.o exports.o os-area.o | 2 | obj-y += interrupt.o exports.o os-area.o |
3 | 3 | ||
4 | obj-$(CONFIG_SMP) += smp.o | ||
4 | obj-$(CONFIG_SPU_BASE) += spu.o | 5 | obj-$(CONFIG_SPU_BASE) += spu.o |
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c index 056c1e4141ba..6f5de438b980 100644 --- a/arch/powerpc/platforms/ps3/interrupt.c +++ b/arch/powerpc/platforms/ps3/interrupt.c | |||
@@ -71,7 +71,7 @@ int ps3_free_io_irq(unsigned int virq) | |||
71 | 71 | ||
72 | result = lv1_destruct_io_irq_outlet(virq_to_hw(virq)); | 72 | result = lv1_destruct_io_irq_outlet(virq_to_hw(virq)); |
73 | 73 | ||
74 | if (!result) | 74 | if (result) |
75 | pr_debug("%s:%d: lv1_destruct_io_irq_outlet failed: %s\n", | 75 | pr_debug("%s:%d: lv1_destruct_io_irq_outlet failed: %s\n", |
76 | __func__, __LINE__, ps3_result(result)); | 76 | __func__, __LINE__, ps3_result(result)); |
77 | 77 | ||