diff options
| author | Justus Winter <justus@gnupg.org> | 2016-02-23 01:29:30 +0100 |
|---|---|---|
| committer | Justus Winter <justus@gnupg.org> | 2016-02-23 01:29:30 +0100 |
| commit | 29303f9a5affd978782a62ae8deccd4579ab3071 (patch) | |
| tree | a78a08b9e63670d96bb2ff1231bf2c9b1ec91304 /debian | |
| parent | 6ecfd03a498e89d43bd178f517b6d0dfa0e49a3d (diff) | |
add patch series
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/procfs-fix0001-procfs-adapt-to-kernel-interface-change.patch | 37 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 38 insertions, 0 deletions
diff --git a/debian/patches/procfs-fix0001-procfs-adapt-to-kernel-interface-change.patch b/debian/patches/procfs-fix0001-procfs-adapt-to-kernel-interface-change.patch new file mode 100644 index 00000000..c47fa63e --- /dev/null +++ b/debian/patches/procfs-fix0001-procfs-adapt-to-kernel-interface-change.patch @@ -0,0 +1,37 @@ +From 59b9cf8f46fb5a186fafe08b2086913cf1b00188 Mon Sep 17 00:00:00 2001 +From: Justus Winter <justus@gnupg.org> +Date: Tue, 23 Feb 2016 01:21:44 +0100 +Subject: [PATCH hurd] procfs: adapt to kernel interface change + +procfs makes use of the debug interface which is subject to change. + +* procfs/rootdir.c (rootdir_gc_slabinfo): The flag +CACHE_FLAGS_NO_RECLAIM is no longer used. +--- + procfs/rootdir.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/procfs/rootdir.c b/procfs/rootdir.c +index 1e9ec8f..93fef8d 100644 +--- a/procfs/rootdir.c ++++ b/procfs/rootdir.c +@@ -446,12 +446,11 @@ rootdir_gc_slabinfo (void *hook, char **contents, ssize_t *contents_len) + + for (i = 0; i < cache_info_count; i++) + { +- mem_usage = (cache_info[i].nr_slabs * cache_info[i].slab_size) +- >> 10; ++ mem_usage = ++ (cache_info[i].nr_slabs * cache_info[i].slab_size) >> 10; + mem_total += mem_usage; +- mem_reclaimable = (cache_info[i].flags & CACHE_FLAGS_NO_RECLAIM) +- ? 0 : (cache_info[i].nr_free_slabs +- * cache_info[i].slab_size) >> 10; ++ mem_reclaimable = ++ (cache_info[i].nr_free_slabs * cache_info[i].slab_size) >> 10; + mem_total_reclaimable += mem_reclaimable; + fprintf (m, + "%-21s %04x %7zu %3zuk %4lu %6lu %6lu %7zuk %10zuk\n", +-- +2.1.4 + diff --git a/debian/patches/series b/debian/patches/series index a2db4949..e6e89bed 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -37,3 +37,4 @@ exec_filename0003-Use-the-new-_hurd_exec_file_name-function.patch exec_filename0004-This-patch-is-an-amendment-of-exec_filename_exec.pat.patch gpg0001-trans-add-transparent-GnuPG-translator.patch crash0001-xxx-crash-logging-works.patch +procfs-fix0001-procfs-adapt-to-kernel-interface-change.patch |