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

Commit e696268a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4165/1: S3C24XX: Select CONFIG_NO_IOPORT
  [ARM] Fix s3c2410 ALSA audio for typedef elimination
  [ARM] Fix ARM AACI ALSA driver
  [ARM] fix mach-at91 build breakage
  [ARM] Fix jornada720 build errors
  [ARM] Fix iop13xx build error
  [ARM] Fix build error caused by move of apm
  [ARM] 4223/1: ixdp2351 : Fix for a define error
  [ARM] 4187/1: iop: unify time implementation across iop32x, iop33x, and iop13xx
  [ARM] 4186/1: iop: remove cp6_enable/disable routines
  [ARM] 4185/2: entry: introduce get_irqnr_preamble and arch_ret_to_user
parents 91aa6931 5a84d159

arch/arm/common/sharpsl_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ 
#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/leds.h>

#include <linux/apm-emulation.h>



#include <asm/hardware.h>

#include <asm/mach-types.h>

#include <asm/irq.h>

#include <asm/apm-emulation.h>

#include <asm/arch/pm.h>

#include <asm/arch/pxa-regs.h>

#include <asm/arch/sharpsl.h>

arch/arm/kernel/entry-armv.S

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
 * Interrupt handling.  Preserves r7, r8, r9

 */

	.macro	irq_handler

	get_irqnr_preamble r5, lr

1:	get_irqnr_and_base r0, r6, r5, lr

	movne	r1, sp

	@

arch/arm/kernel/entry-common.S

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include <asm/unistd.h>

#include <asm/arch/entry-macro.S>



#include "entry-header.S"
@@ -25,6 +26,9 @@ ret_fast_syscall: 
	tst	r1, #_TIF_WORK_MASK

	bne	fast_work_pending



	/* perform architecture specific actions before user return */

	arch_ret_to_user r1, lr



	@ fast_restore_user_regs

	ldr	r1, [sp, #S_OFF + S_PSR]	@ get calling cpsr

	ldr	lr, [sp, #S_OFF + S_PC]!	@ get pc
@@ -61,6 +65,9 @@ ret_slow_syscall: 
	tst	r1, #_TIF_WORK_MASK

	bne	work_pending

no_work_pending:

	/* perform architecture specific actions before user return */

	arch_ret_to_user r1, lr



	@ slow_restore_user_regs

	ldr	r1, [sp, #S_PSR]		@ get calling cpsr

	ldr	lr, [sp, #S_PC]!		@ get pc

arch/arm/mach-iop13xx/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ obj- := 


obj-$(CONFIG_ARCH_IOP13XX) += setup.o

obj-$(CONFIG_ARCH_IOP13XX) += irq.o

obj-$(CONFIG_ARCH_IOP13XX) += time.o

obj-$(CONFIG_ARCH_IOP13XX) += pci.o

obj-$(CONFIG_ARCH_IOP13XX) += io.o

obj-$(CONFIG_MACH_IQ81340SC) += iq81340sc.o

arch/arm/mach-iop13xx/iq81340mc.c

+3 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <asm/mach/arch.h>

#include <asm/arch/pci.h>

#include <asm/mach/time.h>

#include <asm/arch/time.h>



extern int init_atu; /* Flag to select which ATU(s) to initialize / disable */
@@ -78,12 +79,12 @@ static void __init iq81340mc_init(void) 


static void __init iq81340mc_timer_init(void)

{

	iop13xx_init_time(400000000);

	iop_init_time(400000000);

}



static struct sys_timer iq81340mc_timer = {

       .init       = iq81340mc_timer_init,

       .offset     = iop13xx_gettimeoffset,

       .offset     = iop_gettimeoffset,

};



MACHINE_START(IQ81340MC, "Intel IQ81340MC")