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

Commit 64c9d27d authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream-fixes

parents 03ee5b1c c0d4d573

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));

block/scsi_ioctl.c

+3 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static int verify_command(struct file *file, unsigned char *cmd) 
static int sg_io(struct file *file, request_queue_t *q,

		struct gendisk *bd_disk, struct sg_io_hdr *hdr)

{

	unsigned long start_time;

	unsigned long start_time, timeout;

	int writing = 0, ret = 0;

	struct request *rq;

	char sense[SCSI_SENSE_BUFFERSIZE];
@@ -271,7 +271,8 @@ static int sg_io(struct file *file, request_queue_t *q, 


	rq->cmd_type = REQ_TYPE_BLOCK_PC;



	rq->timeout = jiffies_to_msecs(hdr->timeout);

	timeout = msecs_to_jiffies(hdr->timeout);

	rq->timeout = (timeout < INT_MAX) ? timeout : INT_MAX;

	if (!rq->timeout)

		rq->timeout = q->sg_timeout;

	if (!rq->timeout)