Commit 4152f935 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'sched/clock' into x86/cleanups 



Reason: The tsc init cleanup depends on sched_clock_init moving past
late_time_init.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents 6effcd92 fa84e9ee

arch/arm/configs/kirkwood_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ CONFIG_SCSI_LOWLEVEL=y 
CONFIG_ATA=y

# CONFIG_ATA_NONSTANDARD is not set

CONFIG_SATA_PMP=y

# CONFIG_SATA_AHCI is not set

CONFIG_SATA_AHCI=y

# CONFIG_SATA_SIL24 is not set

CONFIG_ATA_SFF=y

# CONFIG_SATA_SVW is not set

arch/arm/mach-kirkwood/ts219-setup.c

+9 −0
Original line number Diff line number Diff line
@@ -206,6 +206,15 @@ static void __init qnap_ts219_init(void) 


}



static int __init ts219_pci_init(void)

{

   if (machine_is_ts219())

           kirkwood_pcie_init();



   return 0;

}

subsys_initcall(ts219_pci_init);



MACHINE_START(TS219, "QNAP TS-119/TS-219")

	/* Maintainer: Martin Michlmayr <tbm@cyrius.com> */

	.phys_io	= KIRKWOOD_REGS_PHYS_BASE,

arch/arm/plat-orion/include/plat/gpio.h

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#ifndef __PLAT_GPIO_H

#define __PLAT_GPIO_H



#include <linux/init.h>



/*

 * GENERIC_GPIO primitives.

 */

arch/avr32/boards/favr-32/setup.c

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,10 @@ static struct ads7846_platform_data ads7843_data = { 
	.debounce_max		= 20,

	.debounce_rep		= 4,

	.debounce_tol		= 5,



	.keep_vref_on		= true,

	.settle_delay_usecs	= 500,

	.penirq_recheck_delay_usecs = 100,

};



static struct spi_board_info __initdata spi1_board_info[] = {

arch/avr32/lib/memcpy.S

+13 −3
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ memcpy: 
	brne	1f



	/* At this point, "from" is word-aligned */

2:	sub	r10, 4

	mov	r9, r12

2:	mov	r9, r12

5:	sub	r10, 4

	brlt	4f



3:	ld.w	r8, r11++
@@ -49,6 +49,7 @@ memcpy: 


	/* Handle unaligned "from" pointer */

1:	sub	r10, 4

	movlt	r9, r12

	brlt	4b

	add	r10, r9

	lsl	r9, 2
@@ -59,4 +60,13 @@ memcpy: 
	st.b	r12++, r8

	ld.ub	r8, r11++

	st.b	r12++, r8

	rjmp	2b
 
	mov	r8, r12

	add	pc, pc, r9

	sub	r8, 1

	nop

	sub	r8, 1

	nop

	sub	r8, 1

	nop

	mov	r9, r8

	rjmp	5b