From 27045891317cf50eac9c8ec3e08b13c8994e31b0 Mon Sep 17 00:00:00 2001 From: Michael Neuling Date: Tue, 8 Jul 2008 18:53:03 +1000 Subject: [PATCH] --- yaml --- r: 101779 b: refs/heads/master c: b887ec620a7575f54fa025d38fa1008dc8a3b12a h: refs/heads/master i: 101777: 96fcf2b599c3179120cfb6a8d898f39c4075b41a 101775: efbbbe700674bc18427ad60309523a1f4607293d v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/align.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c5609b840fae..5d3f044670b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1cb299ead405f0ac065c4430729549b187e5b32 +refs/heads/master: b887ec620a7575f54fa025d38fa1008dc8a3b12a diff --git a/trunk/arch/powerpc/kernel/align.c b/trunk/arch/powerpc/kernel/align.c index c95954c81454..f22b5d0a4a97 100644 --- a/trunk/arch/powerpc/kernel/align.c +++ b/trunk/arch/powerpc/kernel/align.c @@ -363,8 +363,8 @@ static int emulate_multiple(struct pt_regs *regs, unsigned char __user *addr, * Only POWER6 has these instructions, and it does true little-endian, * so we don't need the address swizzling. */ -static int emulate_fp_pair(struct pt_regs *regs, unsigned char __user *addr, - unsigned int reg, unsigned int flags) +static int emulate_fp_pair(unsigned char __user *addr, unsigned int reg, + unsigned int flags) { char *ptr = (char *) ¤t->thread.TS_FPR(reg); int i, ret; @@ -759,7 +759,7 @@ int fix_alignment(struct pt_regs *regs) /* Special case for 16-byte FP loads and stores */ if (nb == 16) - return emulate_fp_pair(regs, addr, reg, flags); + return emulate_fp_pair(addr, reg, flags); /* If we are loading, get the data from user space, else * get it from register values