Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5263bf65 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7d620a4e 545da94f

arch/powerpc/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -526,12 +526,15 @@ config PPC_IBM_CELL_BLADE 
	select UDBG_RTAS_CONSOLE



config PPC_PS3

	bool "Sony PS3"

	bool "Sony PS3 (incomplete)"

	depends on PPC_MULTIPLATFORM && PPC64

	select PPC_CELL

	help

	  This option enables support for the Sony PS3 game console

	  and other platforms using the PS3 hypervisor.

	  Support for this platform is not yet complete, so

	  enabling this will not result in a bootable kernel on a

	  PS3 system.



config PPC_NATIVE

	bool

arch/powerpc/kernel/pci_64.c

+1 −1
Original line number Diff line number Diff line
@@ -1430,7 +1430,7 @@ long sys_pciconfig_iobase(long which, unsigned long in_bus, 


	for (ln = pci_root_buses.next; ln != &pci_root_buses; ln = ln->next) {

		bus = pci_bus_b(ln);

		if (in_bus >= bus->number && in_bus < (bus->number + bus->subordinate))

		if (in_bus >= bus->number && in_bus <= bus->subordinate)

			break;

		bus = NULL;

	}

arch/powerpc/platforms/ps3/Makefile

+2 −1
Original line number Diff line number Diff line 
obj-y += setup.o mm.o smp.o time.o hvcall.o htab.o repository.o

obj-y += setup.o mm.o time.o hvcall.o htab.o repository.o

obj-y += interrupt.o exports.o os-area.o



obj-$(CONFIG_SMP) += smp.o

obj-$(CONFIG_SPU_BASE) += spu.o

arch/powerpc/platforms/ps3/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ int ps3_free_io_irq(unsigned int virq) 


	result = lv1_destruct_io_irq_outlet(virq_to_hw(virq));



	if (!result)

	if (result)

		pr_debug("%s:%d: lv1_destruct_io_irq_outlet failed: %s\n",

			__func__, __LINE__, ps3_result(result));