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

Commit c5fbc396 authored by David Woodhouse's avatar David Woodhouse
Browse files

Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

parents 39299d9d 9e566d8b

Documentation/scsi/scsi_mid_low_api.txt

+0 −15
Original line number Diff line number Diff line
@@ -388,7 +388,6 @@ Summary: 
   scsi_remove_device - detach and remove a SCSI device

   scsi_remove_host - detach and remove all SCSI devices owned by host

   scsi_report_bus_reset - report scsi _bus_ reset observed

   scsi_set_device - place device reference in host structure

   scsi_track_queue_full - track successive QUEUE_FULL events 

   scsi_unblock_requests - allow further commands to be queued to given host

   scsi_unregister - [calls scsi_host_put()]
@@ -740,20 +739,6 @@ int scsi_remove_host(struct Scsi_Host *shost) 
void scsi_report_bus_reset(struct Scsi_Host * shost, int channel)





/**

 * scsi_set_device - place device reference in host structure

 * @shost: a pointer to a scsi host instance

 * @pdev: pointer to device instance to assign

 *

 *      Returns nothing

 *

 *      Might block: no

 *

 *      Defined in: include/scsi/scsi_host.h .

 **/

void scsi_set_device(struct Scsi_Host * shost, struct device * dev)





/**

 * scsi_track_queue_full - track successive QUEUE_FULL events on given

 *                      device to determine if and when there is a need

MAINTAINERS

+8 −1
Original line number Diff line number Diff line
@@ -1419,13 +1419,20 @@ W: http://www.penguinppc.org/ 
L:	linuxppc-embedded@ozlabs.org

S:	Maintained



LINUX FOR POWERPC EMBEDDED PPC8XX AND BOOT CODE

LINUX FOR POWERPC BOOT CODE

P:	Tom Rini

M:	trini@kernel.crashing.org

W:	http://www.penguinppc.org/

L:	linuxppc-embedded@ozlabs.org

S:	Maintained



LINUX FOR POWERPC EMBEDDED PPC8XX

P:	Marcelo Tosatti

M:	marcelo.tosatti@cyclades.com

W:	http://www.penguinppc.org/

L:	linuxppc-embedded@ozlabs.org

S:	Maintained



LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX

P:     Kumar Gala

M:     kumar.gala@freescale.com

arch/alpha/kernel/process.c

+0 −3
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ machine_restart(char *restart_cmd) 
	common_shutdown(LINUX_REBOOT_CMD_RESTART, restart_cmd);

}



EXPORT_SYMBOL(machine_restart);



void

machine_halt(void)
@@ -173,7 +172,6 @@ machine_halt(void) 
	common_shutdown(LINUX_REBOOT_CMD_HALT, NULL);

}



EXPORT_SYMBOL(machine_halt);



void

machine_power_off(void)
@@ -181,7 +179,6 @@ machine_power_off(void) 
	common_shutdown(LINUX_REBOOT_CMD_POWER_OFF, NULL);

}



EXPORT_SYMBOL(machine_power_off);



/* Used by sysrq-p, among others.  I don't believe r9-r15 are ever

   saved in the context it's used.  */

arch/arm/boot/compressed/head-shark.S

+33 −9
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ __beginning: mov r4, r0 @ save the entry to the firmware 


		mov	pc, r2



__copy_target:	.long	0x08508000

__copy_end:	.long	0x08608000

__copy_target:	.long	0x08507FFC

__copy_end:	.long	0x08607FFC

		

		.word	_start

		.word	__bss_start
@@ -73,9 +73,10 @@ __copy_end: .long 0x08608000 
__temp_stack:	.space 128



__mmu_off:

		adr	r0, __ofw_data

		adr	r0, __ofw_data			@ read the 1. entry of the memory map

		ldr	r0, [r0, #4]

		orr	r0, r0, #0x00600000

		sub	r0, r0, #4

	

		ldr	r1, __copy_end

		ldr	r3, __copy_target
@@ -89,20 +90,43 @@ __mmu_off: 
 * from 0x08500000 to 0x08508000 if we have only 8MB

 */



/* As we get more 2.6-kernels it gets more and more

 * uncomfortable to be bound to kernel images of 1MB only.

 * So we add a loop here, to be able to copy some more.

 * Alexander Schulz 2005-07-17

 */



		mov	r4, #3				@ How many megabytes to copy





__MoveCode:	sub	r4, r4, #1

	

__Copy:		ldr	r2, [r0], #-4

		str	r2, [r1], #-4

		teq	r1, r3

		bne	__Copy



		/* The firmware maps us in blocks of 1 MB, the next block is

		   _below_ the last one. So our decrementing source pointer

		   ist right here, but the destination pointer must be increased

		   by 2 MB */

		add	r1, r1, #0x00200000

		add	r3, r3, #0x00100000



		teq	r4, #0

		bne	__MoveCode





		/* and jump to it */

		adr	r2, __go_on

		adr	r0, __ofw_data

		adr	r2, __go_on			@ where we want to jump

		adr	r0, __ofw_data			@ read the 1. entry of the memory map

		ldr	r0, [r0, #4]

		sub	r2, r2, r0

		sub	r2, r2, #0x00500000

		ldr	r0, __copy_target

		sub	r2, r2, r0			@ we are mapped add 0e50 now, sub that (-0e00)

		sub	r2, r2, #0x00500000		@ -0050

		ldr	r0, __copy_target		@ and add 0850 8000 instead

		add	r0, r0, #4

		add	r2, r2, r0

		mov	pc, r2

		mov	pc, r2				@ and jump there



__go_on:

		adr	sp, __temp_stack

arch/arm/configs/bast_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -561,7 +561,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y 
#

CONFIG_SERIAL_S3C2410=y

CONFIG_SERIAL_S3C2410_CONSOLE=y

CONFIG_SERIAL_BAST_SIO=y

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

CONFIG_UNIX98_PTYS=y