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

Commit 42cbe827 authored by Russell King's avatar Russell King
Browse files

Merge branches 'fixes', 'mmci' and 'sa11x0' into for-next

parents df762ecc 6ecf830e 1ff44433 f3964fe1

arch/arm/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -696,7 +696,6 @@ config ARCH_SA1100 
	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select HAVE_IDE

	select HAVE_IDE

	select ISA

	select ISA

	select NEED_MACH_GPIO_H

	select NEED_MACH_MEMORY_H

	select NEED_MACH_MEMORY_H

	select SPARSE_IRQ

	select SPARSE_IRQ

	help

	help

arch/arm/configs/h3600_defconfig

+6 −16
Original line number Original line Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_SYSVIPC=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_LOG_BUF_SHIFT=14

CONFIG_BLK_DEV_INITRD=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_MODULES=y

CONFIG_MODULES=y
@@ -11,11 +12,11 @@ CONFIG_ARCH_SA1100=y 
CONFIG_SA1100_H3600=y

CONFIG_SA1100_H3600=y

CONFIG_PCCARD=y

CONFIG_PCCARD=y

CONFIG_PCMCIA_SA1100=y

CONFIG_PCMCIA_SA1100=y

CONFIG_PREEMPT=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

# CONFIG_CPU_FREQ_STAT is not set

# CONFIG_CPU_FREQ_STAT is not set

CONFIG_FPE_NWFPE=y

CONFIG_FPE_NWFPE=y

CONFIG_PM=y

CONFIG_NET=y

CONFIG_NET=y

CONFIG_UNIX=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_INET=y
@@ -24,13 +25,10 @@ CONFIG_IRDA=m 
CONFIG_IRLAN=m

CONFIG_IRLAN=m

CONFIG_IRNET=m

CONFIG_IRNET=m

CONFIG_IRCOMM=m

CONFIG_IRCOMM=m

CONFIG_SA1100_FIR=m

# CONFIG_WIRELESS is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD=y

CONFIG_MTD_PARTITIONS=y

CONFIG_MTD_REDBOOT_PARTS=y

CONFIG_MTD_REDBOOT_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_ADV_OPTIONS=y

CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -41,19 +39,15 @@ CONFIG_MTD_SA1100=y 
CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_BLK_DEV_RAM_SIZE=8192

# CONFIG_MISC_DEVICES is not set

CONFIG_IDE=y

CONFIG_IDE=y

CONFIG_BLK_DEV_IDECS=y

CONFIG_BLK_DEV_IDECS=y

CONFIG_NETDEVICES=y

CONFIG_NETDEVICES=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

CONFIG_NET_PCMCIA=y

CONFIG_PCMCIA_PCNET=y

CONFIG_PCMCIA_PCNET=y

CONFIG_PPP=m

CONFIG_PPP=m

CONFIG_PPP_ASYNC=m

CONFIG_PPP_DEFLATE=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_BSDCOMP=m

CONFIG_PPP_DEFLATE=m

CONFIG_PPP_ASYNC=m

# CONFIG_WLAN is not set

# CONFIG_KEYBOARD_ATKBD is not set

# CONFIG_KEYBOARD_ATKBD is not set

CONFIG_KEYBOARD_GPIO=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_MOUSE is not set
@@ -64,8 +58,6 @@ CONFIG_SERIAL_SA1100_CONSOLE=y 
# CONFIG_HWMON is not set

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FB=y

CONFIG_FB_SA1100=y

CONFIG_FB_SA1100=y

# CONFIG_VGA_CONSOLE is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS=y

CONFIG_MSDOS_FS=m

CONFIG_MSDOS_FS=m
@@ -74,6 +66,4 @@ CONFIG_JFFS2_FS=y 
CONFIG_CRAMFS=m

CONFIG_CRAMFS=m

CONFIG_NFS_FS=y

CONFIG_NFS_FS=y

CONFIG_NFSD=m

CONFIG_NFSD=m

CONFIG_SMB_FS=m

CONFIG_NLS=y
 
CONFIG_NLS=y
 
# CONFIG_RCU_CPU_STALL_DETECTOR is not set

arch/arm/kernel/entry-armv.S

+1 −0
Original line number Original line Diff line number Diff line
@@ -192,6 +192,7 @@ __dabt_svc: 
	svc_entry

	svc_entry

	mov	r2, sp

	mov	r2, sp

	dabt_helper

	dabt_helper

 THUMB(	ldr	r5, [sp, #S_PSR]	)	@ potentially updated CPSR

	svc_exit r5				@ return from exception

	svc_exit r5				@ return from exception

 UNWIND(.fnend		)

 UNWIND(.fnend		)

ENDPROC(__dabt_svc)

ENDPROC(__dabt_svc)

arch/arm/kernel/signal.c

+10 −4
Original line number Original line Diff line number Diff line
@@ -353,12 +353,18 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig, 
		 */

		 */

		thumb = handler & 1;

		thumb = handler & 1;





		if (thumb) {

			cpsr |= PSR_T_BIT;

#if __LINUX_ARM_ARCH__ >= 7

#if __LINUX_ARM_ARCH__ >= 7

			/* clear the If-Then Thumb-2 execution state */

		/*

		 * Clear the If-Then Thumb-2 execution state

		 * ARM spec requires this to be all 000s in ARM mode

		 * Snapdragon S4/Krait misbehaves on a Thumb=>ARM

		 * signal transition without this.

		 */

		cpsr &= ~PSR_IT_MASK;

		cpsr &= ~PSR_IT_MASK;

#endif

#endif



		if (thumb) {

			cpsr |= PSR_T_BIT;

		} else

		} else

			cpsr &= ~PSR_T_BIT;

			cpsr &= ~PSR_T_BIT;

	}

	}

arch/arm/mach-highbank/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ config ARCH_HIGHBANK 
	select ARM_AMBA

	select ARM_AMBA

	select ARM_ERRATA_764369

	select ARM_ERRATA_764369

	select ARM_ERRATA_775420

	select ARM_ERRATA_775420

	select ARM_ERRATA_798181

	select ARM_ERRATA_798181 if SMP

	select ARM_GIC

	select ARM_GIC

	select ARM_TIMER_SP804

	select ARM_TIMER_SP804

	select CACHE_L2X0

	select CACHE_L2X0