tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix sys_pciconfig_iobase bus matching
[POWERPC] PS3: add not complete comment to kconfig
[POWERPC] ps3_free_io_irq: Fix inverted error check
[POWERPC] PS3: Fix uniprocessor kernel build

Linus Torvalds 5263bf65 7d620a4e

+8 -4
+4 -1
arch/powerpc/Kconfig
··· 526 526 select UDBG_RTAS_CONSOLE 527 527 528 528 config PPC_PS3 529 - bool "Sony PS3" 529 + bool "Sony PS3 (incomplete)" 530 530 depends on PPC_MULTIPLATFORM && PPC64 531 531 select PPC_CELL 532 532 help 533 533 This option enables support for the Sony PS3 game console 534 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 539 config PPC_NATIVE 537 540 bool
+1 -1
arch/powerpc/kernel/pci_64.c
··· 1430 1430 1431 1431 for (ln = pci_root_buses.next; ln != &pci_root_buses; ln = ln->next) { 1432 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 1434 break; 1435 1435 bus = NULL; 1436 1436 }
+2 -1
arch/powerpc/platforms/ps3/Makefile
··· 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 2 obj-y += interrupt.o exports.o os-area.o 3 3 4 + obj-$(CONFIG_SMP) += smp.o 4 5 obj-$(CONFIG_SPU_BASE) += spu.o
+1 -1
arch/powerpc/platforms/ps3/interrupt.c
··· 71 71 72 72 result = lv1_destruct_io_irq_outlet(virq_to_hw(virq)); 73 73 74 - if (!result) 74 + if (result) 75 75 pr_debug("%s:%d: lv1_destruct_io_irq_outlet failed: %s\n", 76 76 __func__, __LINE__, ps3_result(result)); 77 77