diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-13 15:37:38 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-13 15:37:38 +0100 |
| commit | 74ff4c05d3ebe58ab8fcc823195d04d6100b7f89 (patch) | |
| tree | 184af6ca063d82ac9a6632a274e78f0c5378c33a /include | |
| parent | 08c70ac97313c2ac0cfb0d44871b4de6ae87ba9c (diff) | |
| parent | 4f42dc62be92afe9863bf2598e6b0d637430f74f (diff) | |
Merge tag 'v4.9.108' into linux-linaro-lsk-v4.9
This is the 4.9.108 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/compiler-gcc.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/btrfs_tree.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index 2214b2f9c73c..ad793c69cc46 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -206,7 +206,7 @@ #ifdef CONFIG_STACK_VALIDATION #define annotate_unreachable() ({ \ asm("1:\t\n" \ - ".pushsection __unreachable, \"a\"\t\n" \ + ".pushsection .discard.unreachable\t\n" \ ".long 1b\t\n" \ ".popsection\t\n"); \ }) diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h index d5ad15a106a7..c794c9af6c0f 100644 --- a/include/uapi/linux/btrfs_tree.h +++ b/include/uapi/linux/btrfs_tree.h @@ -452,6 +452,7 @@ struct btrfs_free_space_header { #define BTRFS_SUPER_FLAG_SEEDING (1ULL << 32) #define BTRFS_SUPER_FLAG_METADUMP (1ULL << 33) +#define BTRFS_SUPER_FLAG_METADUMP_V2 (1ULL << 34) /* |