From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 28 Apr 2012 17:10:52 +0000 (+0100)
Subject: Merge branches 'amba', 'clkdev', 'fixes', 'mach-types', 'misc' and 'mmci' into for... 
X-Git-Tag: next-20120430~99^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4a727ab501bbebe94b5c8731de7447147094e6ba;p=karo-tx-linux.git

Merge branches 'amba', 'clkdev', 'fixes', 'mach-types', 'misc' and 'mmci' into for-next
---

4a727ab501bbebe94b5c8731de7447147094e6ba
diff --cc arch/arm/kernel/signal.c
index 7cb532fc8aa4,7cb532fc8aa4,d68d1b694680,7cb532fc8aa4,6e67f1bf1a6a,7cb532fc8aa4..73d9a420850d
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@@@@@@ -189,26 -189,26 -187,10 -189,26 -189,26 -189,26 +187,10 @@@@@@@ static int preserve_vfp_context(struct 
      	__put_user_error(magic, &frame->magic, err);
      	__put_user_error(size, &frame->size, err);
      
-- ---	/*
-- ---	 * Copy the floating point registers. There can be unused
-- ---	 * registers see asm/hwcap.h for details.
-- ---	 */
-- ---	err |= __copy_to_user(&frame->ufp.fpregs, &h->fpregs,
-- ---			      sizeof(h->fpregs));
-- ---	/*
-- ---	 * Copy the status and control register.
-- ---	 */
-- ---	__put_user_error(h->fpscr, &frame->ufp.fpscr, err);
-- ---
-- ---	/*
-- ---	 * Copy the exception registers.
-- ---	 */
-- ---	__put_user_error(h->fpexc, &frame->ufp_exc.fpexc, err);
-- ---	__put_user_error(h->fpinst, &frame->ufp_exc.fpinst, err);
-- ---	__put_user_error(h->fpinst2, &frame->ufp_exc.fpinst2, err);
    - 
    - 	return err ? -EFAULT : 0;
++ +++	if (err)
++ +++		return -EFAULT;
    + 
-- - -	return err ? -EFAULT : 0;
++ +++	return vfp_preserve_user_clear_hwstate(&frame->ufp, &frame->ufp_exc);
      }
      
      static int restore_vfp_context(struct vfp_sigframe __user *frame)