Accepting request 248110 from Kernel:kdump

Fix a silly mistake in kdump-count-const-slabs.patch

OBS-URL: https://build.opensuse.org/request/show/248110
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdump?expand=0&rev=78
This commit is contained in:
Stephan Kulow 2014-09-10 15:01:18 +00:00 committed by Git OBS Bridge
commit 81a58d2868
2 changed files with 11 additions and 3 deletions

View File

@ -4,6 +4,7 @@ Subject: Take constant-size slabs into account for "kdump calibrate"
References: bnc#879460
Patch-mainline: v0.8.16
Git-commit: 3a7c9b3a02893ab9ac39e23cae5ead9e42716927
Git-commit: 8c0a42e80a89100addc09d584253f1c8accde500
Some slabs do not depend on available memory or system utilization.
Their size can be taken directly from the running kernel.
@ -15,8 +16,8 @@ one I saw had over 10 megabytes).
Signed-off-by: Petr Tesarik <ptesarik@suse.cz>
---
kdumptool/calibrate.cc | 213 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 213 insertions(+)
kdumptool/calibrate.cc | 215 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 215 insertions(+)
--- a/kdumptool/calibrate.cc
+++ b/kdumptool/calibrate.cc
@ -222,7 +223,7 @@ Signed-off-by: Petr Tesarik <ptesarik@suse.cz>
//{{{ Calibrate ----------------------------------------------------------------
// -----------------------------------------------------------------------------
@@ -498,6 +693,24 @@ void Calibrate::execute()
@@ -498,6 +693,26 @@ void Calibrate::execute()
required += DEF_FRAMEBUFFER_KB;
}
@ -236,6 +237,8 @@ Signed-off-by: Petr Tesarik <ptesarik@suse.cz>
+ it->first.startsWith("ftrace_") ) {
+ unsigned long slabsize = it->second->numSlabs() *
+ it->second->pagesPerSlab() * pagesize / 1024;
+ required += slabsize;
+
+ Debug::debug()->dbg("Adding %ld KiB for %s slab cache",
+ slabsize, it->second->name().c_str());
+ }

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Sep 9 06:08:44 UTC 2014 - ptesarik@suse.cz
- kdump-count-const-slabs.patch: Add missing addition.
-------------------------------------------------------------------
Mon Sep 8 15:36:29 UTC 2014 - ptesarik@suse.cz