Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / nbnxn_kernels / nbnxn_kernel_x86_simd128.h

diff --git a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd128.h b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd128.h
index 5732f9e1ca0a7ebcabf1ed982886413b16af62f9..5488bfa22fd464c88d7cfaddd6c7188cdc0bdcc4 100644 (file)
--- a/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd128.h
+++ b/src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_x86_simd128.h
@@ -46,6 +46,7 @@ void
 nbnxn_kernel_x86_simd128(nbnxn_pairlist_set_t       *nbl_list,
                          const nbnxn_atomdata_t     *nbat,
                          const interaction_const_t  *ic,
+                         int                        ewald_excl,
                          rvec                       *shift_vec,
                          int                        force_flags,
                          int                        clearF,