diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-11 19:34:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-11 19:34:09 -0700 |
| commit | 01b0c014eeb0bb857a5dc572cd108be7becddfe7 (patch) | |
| tree | d6f1a089081aadb09e66add27f7c5137d076ac80 /kernel/Makefile | |
| parent | 3ebb0540c20d6670396ccee9ff6794c095fa9311 (diff) | |
| parent | e527b22c3f63c02832ac4cb8ed0ec3a9b638bbdf (diff) | |
| download | blackbird-op-linux-01b0c014eeb0bb857a5dc572cd108be7becddfe7.tar.gz blackbird-op-linux-01b0c014eeb0bb857a5dc572cd108be7becddfe7.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge fourth patch-bomb from Andrew Morton:
- sys_membarier syscall
- seq_file interface changes
- a few misc fixups
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
revert "ocfs2/dlm: use list_for_each_entry instead of list_for_each"
mm/early_ioremap: add explicit #include of asm/early_ioremap.h
fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void
selftests: enhance membarrier syscall test
selftests: add membarrier syscall test
sys_membarrier(): system-wide memory barrier (generic, x86)
MODSIGN: fix a compilation warning in extract-cert
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index d4988410b410..53abf008ecb3 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -100,6 +100,7 @@ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o obj-$(CONFIG_JUMP_LABEL) += jump_label.o obj-$(CONFIG_CONTEXT_TRACKING) += context_tracking.o obj-$(CONFIG_TORTURE_TEST) += torture.o +obj-$(CONFIG_MEMBARRIER) += membarrier.o obj-$(CONFIG_HAS_IOMEM) += memremap.o |
