diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-25 09:59:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-25 09:59:19 +0200 |
| commit | 8d58b66ed2b000f27658c88a4ed70e8042e86a58 (patch) | |
| tree | 5bae2c74f932b5d863f72cb698a6f71260340b26 /arch/tile/kernel/hvglue.S | |
| parent | 13fe86f465b72fc9328d4f5ebc33223c011852ae (diff) | |
| parent | c13dcf9f2d6f5f06ef1bf79ec456df614c5e058b (diff) | |
Merge tag 'v4.2-rc8' into x86/mm, before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/tile/kernel/hvglue.S')
| -rw-r--r-- | arch/tile/kernel/hvglue.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/tile/kernel/hvglue.S b/arch/tile/kernel/hvglue.S index 2ab456622391..d78ee2ad610c 100644 --- a/arch/tile/kernel/hvglue.S +++ b/arch/tile/kernel/hvglue.S @@ -71,4 +71,5 @@ gensym hv_flush_all, 0x6e0, 32 gensym hv_get_ipi_pte, 0x700, 32 gensym hv_set_pte_super_shift, 0x720, 32 gensym hv_console_set_ipi, 0x7e0, 32 -gensym hv_glue_internals, 0x800, 30720 +gensym hv_send_nmi, 0x820, 32 +gensym hv_glue_internals, 0x820, 30688 |