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

Commit 7cafae52 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] iwmmxt thread state alignment
  [ARM] 3350/1: Enable 1-wire on ARM
  [ARM] 3356/1: Workaround for the ARM1136 I-cache invalidation problem
  [ARM] 3355/1: NSLU2: remove propmt depends
  [ARM] 3354/1: NAS100d: fix power led handling
  [ARM] Fix muldi3.S
parents ba244fe9 cdaabbd7

arch/arm/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -799,6 +799,8 @@ source "drivers/i2c/Kconfig" 




source "drivers/spi/Kconfig"

source "drivers/spi/Kconfig"





source "drivers/w1/Kconfig"



source "drivers/hwmon/Kconfig"

source "drivers/hwmon/Kconfig"





#source "drivers/l3/Kconfig"

#source "drivers/l3/Kconfig"

arch/arm/kernel/asm-offsets.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,9 @@ int main(void) 
  DEFINE(TI_TP_VALUE,		offsetof(struct thread_info, tp_value));

  DEFINE(TI_TP_VALUE,		offsetof(struct thread_info, tp_value));

  DEFINE(TI_FPSTATE,		offsetof(struct thread_info, fpstate));

  DEFINE(TI_FPSTATE,		offsetof(struct thread_info, fpstate));

  DEFINE(TI_VFPSTATE,		offsetof(struct thread_info, vfpstate));

  DEFINE(TI_VFPSTATE,		offsetof(struct thread_info, vfpstate));

  DEFINE(TI_IWMMXT_STATE,	(offsetof(struct thread_info, fpstate)+4)&~7);

#ifdef CONFIG_IWMMXT

  DEFINE(TI_IWMMXT_STATE,	offsetof(struct thread_info, fpstate.iwmmxt));

#endif

  BLANK();

  BLANK();

  DEFINE(S_R0,			offsetof(struct pt_regs, ARM_r0));

  DEFINE(S_R0,			offsetof(struct pt_regs, ARM_r0));

  DEFINE(S_R1,			offsetof(struct pt_regs, ARM_r1));

  DEFINE(S_R1,			offsetof(struct pt_regs, ARM_r1));

arch/arm/kernel/ptrace.c

+4 −10
Original line number Original line Diff line number Diff line
@@ -610,15 +610,12 @@ static int ptrace_setfpregs(struct task_struct *tsk, void __user *ufp) 
static int ptrace_getwmmxregs(struct task_struct *tsk, void __user *ufp)

static int ptrace_getwmmxregs(struct task_struct *tsk, void __user *ufp)

{

{

	struct thread_info *thread = task_thread_info(tsk);

	struct thread_info *thread = task_thread_info(tsk);

	void *ptr = &thread->fpstate;





	if (!test_ti_thread_flag(thread, TIF_USING_IWMMXT))

	if (!test_ti_thread_flag(thread, TIF_USING_IWMMXT))

		return -ENODATA;

		return -ENODATA;

	iwmmxt_task_disable(thread);  /* force it to ram */

	iwmmxt_task_disable(thread);  /* force it to ram */

	/* The iWMMXt state is stored doubleword-aligned.  */

	return copy_to_user(ufp, &thread->fpstate.iwmmxt, IWMMXT_SIZE)

	if (((long) ptr) & 4)

		? -EFAULT : 0;

		ptr += 4;

	return copy_to_user(ufp, ptr, 0x98) ? -EFAULT : 0;

}

}





/*

/*
@@ -627,15 +624,12 @@ static int ptrace_getwmmxregs(struct task_struct *tsk, void __user *ufp) 
static int ptrace_setwmmxregs(struct task_struct *tsk, void __user *ufp)

static int ptrace_setwmmxregs(struct task_struct *tsk, void __user *ufp)

{

{

	struct thread_info *thread = task_thread_info(tsk);

	struct thread_info *thread = task_thread_info(tsk);

	void *ptr = &thread->fpstate;





	if (!test_ti_thread_flag(thread, TIF_USING_IWMMXT))

	if (!test_ti_thread_flag(thread, TIF_USING_IWMMXT))

		return -EACCES;

		return -EACCES;

	iwmmxt_task_release(thread);  /* force a reload */

	iwmmxt_task_release(thread);  /* force a reload */

	/* The iWMMXt state is stored doubleword-aligned.  */

	return copy_from_user(&thead->fpstate.iwmmxt, ufp, IWMMXT_SIZE)

	if (((long) ptr) & 4)

		? -EFAULT : 0;

		ptr += 4;

	return copy_from_user(ptr, ufp, 0x98) ? -EFAULT : 0;

}

}





#endif

#endif

arch/arm/lib/muldi3.S

+2 −2
Original line number Original line Diff line number Diff line
@@ -29,8 +29,8 @@ ENTRY(__aeabi_lmul) 




	mul	xh, yl, xh

	mul	xh, yl, xh

	mla	xh, xl, yh, xh

	mla	xh, xl, yh, xh

	mov	ip, xl, asr #16

	mov	ip, xl, lsr #16

	mov	yh, yl, asr #16

	mov	yh, yl, lsr #16

	bic	xl, xl, ip, lsl #16

	bic	xl, xl, ip, lsl #16

	bic	yl, yl, yh, lsl #16

	bic	yl, yl, yh, lsl #16

	mla	xh, yh, ip, xh

	mla	xh, yh, ip, xh

arch/arm/mach-ixp4xx/Kconfig

+1 −3
Original line number Original line Diff line number Diff line
@@ -8,11 +8,9 @@ menu "Intel IXP4xx Implementation Options" 




comment "IXP4xx Platforms"

comment "IXP4xx Platforms"





# This entry is placed on top because otherwise it would have

# been shown as a submenu.

config MACH_NSLU2

config MACH_NSLU2

	bool

	bool

	prompt "NSLU2" if !(MACH_IXDP465 || MACH_IXDPG425 || ARCH_IXDP425 || ARCH_ADI_COYOTE || ARCH_AVILA || ARCH_IXCDP1100 || ARCH_PRPMC1100 || MACH_GTWX5715)

	prompt "Linksys NSLU2"

	help

	help

	  Say 'Y' here if you want your kernel to support Linksys's

	  Say 'Y' here if you want your kernel to support Linksys's

	  NSLU2 NAS device. For more information on this platform,

	  NSLU2 NAS device. For more information on this platform,