diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-08 14:48:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-08 14:48:20 -0400 |
| commit | 9dda1658a9bd450d65da5153a2427955785d17c2 (patch) | |
| tree | c563b728d879c2b446a8f1c33ce351ffb1f1d34e /arch/x86/net | |
| parent | b72e7464e4cf80117938e6adb8c22fdc1ca46d42 (diff) | |
| parent | a49976d14f780942dafafbbf16f891c27d385ea0 (diff) | |
Merge branch 'x86/asm' into x86/core, to prepare for new patch
Collect all changes to arch/x86/entry/entry_64.S, before applying
patch that changes most of the file.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/net')
| -rw-r--r-- | arch/x86/net/bpf_jit.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S index 6440221ced0d..4093216b3791 100644 --- a/arch/x86/net/bpf_jit.S +++ b/arch/x86/net/bpf_jit.S | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * of the License. | 8 | * of the License. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 11 | #include <asm/dwarf2.h> | ||
| 12 | 11 | ||
| 13 | /* | 12 | /* |
| 14 | * Calling convention : | 13 | * Calling convention : |