diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:27:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 03:27:23 -0400 |
| commit | 0c8c708a7e6b52556ee9079041f504191ec5f0e9 (patch) | |
| tree | fb8da2f5e70ac1d21d41d5a900e48d42c1c999eb /arch/x86/kernel/ptrace.c | |
| parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) | |
| parent | d3d0ba7b8fb8f57c33207adcb41f40c176148c03 (diff) | |
Merge branch 'x86/core' into x86/unify-cpu-detect
Diffstat (limited to 'arch/x86/kernel/ptrace.c')
| -rw-r--r-- | arch/x86/kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index e37dccce85db..fc3e8dcd9da6 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c | |||
| @@ -69,7 +69,7 @@ static inline bool invalid_selector(u16 value) | |||
| 69 | 69 | ||
| 70 | #define FLAG_MASK FLAG_MASK_32 | 70 | #define FLAG_MASK FLAG_MASK_32 |
| 71 | 71 | ||
| 72 | static long *pt_regs_access(struct pt_regs *regs, unsigned long regno) | 72 | static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long regno) |
| 73 | { | 73 | { |
| 74 | BUILD_BUG_ON(offsetof(struct pt_regs, bx) != 0); | 74 | BUILD_BUG_ON(offsetof(struct pt_regs, bx) != 0); |
| 75 | regno >>= 2; | 75 | regno >>= 2; |