diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-03 17:23:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-03 17:23:50 -0700 |
| commit | bc2391e7bdfe7318b077f0d257d6ee1a77dda452 (patch) | |
| tree | 7b6e81e5aecdbcebf93a05178ef0223c3e4ba0a8 /samples/vfs/test-statx.c | |
| parent | 0c7d7d1fada70420851b63f2e2669cb4976a303b (diff) | |
| parent | 8beeae86b8e19a4714531f8764b68bd828ffba2a (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"Subsystems affected by this patch series: mm/hugetlb, samples, mm/cma,
mm/vmalloc, mm/pagealloc"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm/page_alloc: fix documentation error
vmalloc: fix the owner argument for the new __vmalloc_node_range callers
mm/cma.c: use exact_nid true to fix possible per-numa cma leak
samples/vfs: avoid warning in statx override
mm/hugetlb.c: fix pages per hugetlb calculation
Diffstat (limited to 'samples/vfs/test-statx.c')
| -rw-r--r-- | samples/vfs/test-statx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/samples/vfs/test-statx.c b/samples/vfs/test-statx.c index 76c577ea4fd8..49c7a46cee07 100644 --- a/samples/vfs/test-statx.c +++ b/samples/vfs/test-statx.c @@ -23,6 +23,8 @@ #include <linux/fcntl.h> #define statx foo #define statx_timestamp foo_timestamp +struct statx; +struct statx_timestamp; #include <sys/stat.h> #undef statx #undef statx_timestamp |