git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull sony into release branch
[pandora-kernel.git]
/
arch
/
i386
/
kernel
/
ptrace.c
diff --git
a/arch/i386/kernel/ptrace.c
b/arch/i386/kernel/ptrace.c
index
af8aabe
..
4a8f8a2
100644
(file)
--- a/
arch/i386/kernel/ptrace.c
+++ b/
arch/i386/kernel/ptrace.c
@@
-89,14
+89,14
@@
static int putreg(struct task_struct *child,
unsigned long regno, unsigned long value)
{
switch (regno >> 2) {
unsigned long regno, unsigned long value)
{
switch (regno >> 2) {
- case
F
S:
+ case
G
S:
if (value && (value & 3) != 3)
return -EIO;
if (value && (value & 3) != 3)
return -EIO;
- child->thread.
f
s = value;
+ child->thread.
g
s = value;
return 0;
case DS:
case ES:
return 0;
case DS:
case ES:
- case
G
S:
+ case
F
S:
if (value && (value & 3) != 3)
return -EIO;
value &= 0xffff;
if (value && (value & 3) != 3)
return -EIO;
value &= 0xffff;
@@
-112,7
+112,7
@@
static int putreg(struct task_struct *child,
value |= get_stack_long(child, EFL_OFFSET) & ~FLAG_MASK;
break;
}
value |= get_stack_long(child, EFL_OFFSET) & ~FLAG_MASK;
break;
}
- if (regno >
E
S*4)
+ if (regno >
F
S*4)
regno -= 1*4;
put_stack_long(child, regno, value);
return 0;
regno -= 1*4;
put_stack_long(child, regno, value);
return 0;
@@
-124,18
+124,18
@@
static unsigned long getreg(struct task_struct *child,
unsigned long retval = ~0UL;
switch (regno >> 2) {
unsigned long retval = ~0UL;
switch (regno >> 2) {
- case
F
S:
- retval = child->thread.
f
s;
+ case
G
S:
+ retval = child->thread.
g
s;
break;
case DS:
case ES:
break;
case DS:
case ES:
- case
G
S:
+ case
F
S:
case SS:
case CS:
retval = 0xffff;
/* fall through */
default:
case SS:
case CS:
retval = 0xffff;
/* fall through */
default:
- if (regno >
E
S*4)
+ if (regno >
F
S*4)
regno -= 1*4;
retval &= get_stack_long(child, regno);
}
regno -= 1*4;
retval &= get_stack_long(child, regno);
}