diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-04-08 09:01:54 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-04-08 09:01:54 +0200 |
commit | 4bcc7827b02feea2c762fa6d46a1bffb300d7403 (patch) | |
tree | 45fd2b64247cd44201fe519720494d4bf01b7014 /arch/x86/kernel/kgdb.c | |
parent | 3f705dfdf85a6416f5f12e52b7610144a99cbedc (diff) | |
parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
download | linux-stable-4bcc7827b02feea2c762fa6d46a1bffb300d7403.tar.gz linux-stable-4bcc7827b02feea2c762fa6d46a1bffb300d7403.tar.bz2 linux-stable-4bcc7827b02feea2c762fa6d46a1bffb300d7403.zip |
Merge tag 'v4.0-rc7' into x86/asm, to resolve conflicts
Conflicts:
arch/x86/kernel/entry_64.S
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/kgdb.c')
-rw-r--r-- | arch/x86/kernel/kgdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c index 7fe3a9d377ea..d6178d9791db 100644 --- a/arch/x86/kernel/kgdb.c +++ b/arch/x86/kernel/kgdb.c @@ -72,7 +72,7 @@ struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] = { "bx", 8, offsetof(struct pt_regs, bx) }, { "cx", 8, offsetof(struct pt_regs, cx) }, { "dx", 8, offsetof(struct pt_regs, dx) }, - { "si", 8, offsetof(struct pt_regs, dx) }, + { "si", 8, offsetof(struct pt_regs, si) }, { "di", 8, offsetof(struct pt_regs, di) }, { "bp", 8, offsetof(struct pt_regs, bp) }, { "sp", 8, offsetof(struct pt_regs, sp) }, |