49 lines
1.4 KiB
Diff
49 lines
1.4 KiB
Diff
|
From 891878c304ebb9da65969fd53a576305e8c880ab Mon Sep 17 00:00:00 2001
|
||
|
|
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
||
|
|
Date: Mon, 21 Jan 2013 14:57:35 +0100
|
||
|
|
Subject: [PATCH 128/364] * grub-core/commands/lsmmap.c: Fix unused
|
||
|
|
variable on emu.
|
||
|
|
|
||
|
|
---
|
||
|
|
ChangeLog | 4 ++++
|
||
|
|
grub-core/commands/lsmmap.c | 2 +-
|
||
|
|
2 files changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/ChangeLog b/ChangeLog
|
||
|
|
index 3c7552b..18f350e 100644
|
||
|
|
--- a/ChangeLog
|
||
|
|
+++ b/ChangeLog
|
||
|
|
@@ -1,5 +1,9 @@
|
||
|
|
2013-01-21 Vladimir Serbinenko <phcoder@gmail.com>
|
||
|
|
|
||
|
|
+ * grub-core/commands/lsmmap.c: Fix unused variable on emu.
|
||
|
|
+
|
||
|
|
+2013-01-21 Vladimir Serbinenko <phcoder@gmail.com>
|
||
|
|
+
|
||
|
|
Improve spkmomdem reliability by adding a separator between bytes.
|
||
|
|
|
||
|
|
2013-01-21 Colin Watson <cjwatson@ubuntu.com>
|
||
|
|
diff --git a/grub-core/commands/lsmmap.c b/grub-core/commands/lsmmap.c
|
||
|
|
index 8e7f2a5..c1a05d8 100644
|
||
|
|
--- a/grub-core/commands/lsmmap.c
|
||
|
|
+++ b/grub-core/commands/lsmmap.c
|
||
|
|
@@ -25,6 +25,7 @@
|
||
|
|
|
||
|
|
GRUB_MOD_LICENSE ("GPLv3+");
|
||
|
|
|
||
|
|
+#ifndef GRUB_MACHINE_EMU
|
||
|
|
static const char *names[] =
|
||
|
|
{
|
||
|
|
[GRUB_MEMORY_AVAILABLE] = N_("available RAM"),
|
||
|
|
@@ -40,7 +41,6 @@ static const char *names[] =
|
||
|
|
[GRUB_MEMORY_HOLE] = N_("Address range not associated with RAM")
|
||
|
|
};
|
||
|
|
|
||
|
|
-#ifndef GRUB_MACHINE_EMU
|
||
|
|
/* Helper for grub_cmd_lsmmap. */
|
||
|
|
static int
|
||
|
|
lsmmap_hook (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,
|
||
|
|
--
|
||
|
|
1.8.1.4
|
||
|
|
|