diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-25 09:00:38 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-25 09:00:38 +0100 |
| commit | c0853867a10f9215132dccdb84c720a5f856f4d2 (patch) | |
| tree | 92d3162ea2fc6fe0276dabc869e01293325f862c /fs | |
| parent | 6dc390ad61ac8dfca5fa9b0823981fb6f7ec17a0 (diff) | |
| parent | 1923f3d02768bd904dfe5607f3f93c3008b8db61 (diff) | |
Merge branch 'x86/debug' into core/objtool, to pick up frame pointer fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/disk-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 4545e2e2ad45..5699bbc23feb 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -931,7 +931,7 @@ static int check_async_write(struct inode *inode, unsigned long bio_flags) if (bio_flags & EXTENT_BIO_TREE_LOG) return 0; #ifdef CONFIG_X86 - if (static_cpu_has_safe(X86_FEATURE_XMM4_2)) + if (static_cpu_has(X86_FEATURE_XMM4_2)) return 0; #endif return 1; |