8c6b1ac71e
Also include some minor fixes for gcc 5.1.1 Signed-off-by: Peter Jones <pjones@redhat.com>
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
From e360b5d176ef0a6e65cbbc3ddfffe9cf4ae7d07d Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Tue, 20 Jan 2015 20:52:41 +0100
|
|
Subject: [PATCH 161/506] * include/grub/misc.h (grub_div_roundup):
|
|
Remove as it's unused.
|
|
|
|
---
|
|
ChangeLog | 4 ++++
|
|
include/grub/misc.h | 7 -------
|
|
2 files changed, 4 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index dc882d8..ecbe11d 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,5 +1,9 @@
|
|
2015-01-20 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
|
+ * include/grub/misc.h (grub_div_roundup): Remove as it's unused.
|
|
+
|
|
+2015-01-20 Vladimir Serbinenko <phcoder@gmail.com>
|
|
+
|
|
* grub-core/term/gfxterm.c: Avoid division by zero.
|
|
|
|
2015-01-20 Vladimir Serbinenko <phcoder@gmail.com>
|
|
diff --git a/include/grub/misc.h b/include/grub/misc.h
|
|
index c6cd456..4b6ee06 100644
|
|
--- a/include/grub/misc.h
|
|
+++ b/include/grub/misc.h
|
|
@@ -390,13 +390,6 @@ grub_abs (int x)
|
|
return (unsigned int) x;
|
|
}
|
|
|
|
-/* Rounded-up division */
|
|
-static inline unsigned int
|
|
-grub_div_roundup (unsigned int x, unsigned int y)
|
|
-{
|
|
- return (x + y - 1) / y;
|
|
-}
|
|
-
|
|
/* Reboot the machine. */
|
|
#if defined (GRUB_MACHINE_EMU) || defined (GRUB_MACHINE_QEMU_MIPS)
|
|
void EXPORT_FUNC(grub_reboot) (void) __attribute__ ((noreturn));
|
|
--
|
|
2.4.3
|
|
|