diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-22 19:48:00 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-22 19:48:00 -0300 |
| commit | 37c6b66933676a18529b4e647d1a79a626900512 (patch) | |
| tree | 71c20974a4371e5bb41d2fa4faa807a73f12f8b8 /testing/systemd | |
| parent | a3574b9529a82018664ff6e810d7d81b2bb4eb75 (diff) | |
| parent | 0297e16d6d46f426939811847e72539d15bbf12d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/qt/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/use-split-usr-path.patch
Diffstat (limited to 'testing/systemd')
| -rw-r--r-- | testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch b/testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch new file mode 100644 index 000000000..c92cf5d11 --- /dev/null +++ b/testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch @@ -0,0 +1,24 @@ +From e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Sat, 22 Sep 2012 00:16:13 +0200 +Subject: [PATCH] journal: bring mmap cache prototype in sync + +--- + src/journal/mmap-cache.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h +index de34634..0c42fb8 100644 +--- a/src/journal/mmap-cache.h ++++ b/src/journal/mmap-cache.h +@@ -31,6 +31,6 @@ MMapCache* mmap_cache_new(void); + MMapCache* mmap_cache_ref(MMapCache *m); + MMapCache* mmap_cache_unref(MMapCache *m); + +-int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, uint64_t size, struct stat *st, void **ret); ++int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, size_t size, struct stat *st, void **ret); + void mmap_cache_close_fd(MMapCache *m, int fd); + void mmap_cache_close_context(MMapCache *m, unsigned context); +-- +1.7.12.1 + |