[packages/suspend-utils/DEVEL] diet fixes (missing __kernel_loff_t)
glen
glen at pld-linux.org
Sun Mar 3 01:49:12 CET 2013
commit 8a440d208fa9521c1c35cb1a2ae3f547146945cb
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Mar 3 02:48:50 2013 +0200
diet fixes (missing __kernel_loff_t)
suspend-diet.patch | 35 ++++++++++++++---------------------
1 file changed, 14 insertions(+), 21 deletions(-)
---
diff --git a/suspend-diet.patch b/suspend-diet.patch
index 731015e..20f2469 100644
--- a/suspend-diet.patch
+++ b/suspend-diet.patch
@@ -1,4 +1,3 @@
-diff -ur suspend/radeontool.c suspend-diet/radeontool.c
--- suspend/radeontool.c 2007-09-13 21:38:10.000000000 +0200
+++ suspend-diet/radeontool.c 2009-04-06 15:09:50.000000000 +0200
@@ -26,6 +26,9 @@
@@ -11,7 +10,6 @@ diff -ur suspend/radeontool.c suspend-diet/radeontool.c
#include <pci/pci.h>
#define RADEON_LVDS_GEN_CNTL 0x02d0
-diff -ur suspend/s2ram-x86.c suspend-diet/s2ram-x86.c
--- suspend/s2ram-x86.c 2008-11-03 16:12:53.000000000 +0100
+++ suspend-diet/s2ram-x86.c 2009-04-06 15:09:34.000000000 +0200
@@ -15,6 +15,9 @@
@@ -24,24 +22,20 @@ diff -ur suspend/s2ram-x86.c suspend-diet/s2ram-x86.c
#include <pci/pci.h>
#include "vbetool/vbetool.h"
-#--- suspend/suspend_ioctls.h 2008-05-06 14:01:06.000000000 +0200
-#+++ suspend-diet/suspend_ioctls.h 2009-04-06 15:03:00.000000000 +0200
-#@@ -8,7 +8,11 @@
-# */
-# struct resume_swap_area {
-# loff_t offset;
-#+#ifdef __dietlibc__
-#+ uint32_t dev;
-#+#else
-# u_int32_t dev;
-#+#endif
-# } __attribute__((packed));
-#
-# #define SNAPSHOT_IOC_MAGIC '3'
-diff -ur suspend/swsusp.h suspend-diet/swsusp.h
---- suspend/swsusp.h 2009-04-06 15:11:06.000000000 +0200
-+++ suspend-diet/swsusp.h 2009-04-06 15:03:27.000000000 +0200
-@@ -115,6 +115,9 @@
+--- suspend-utils-1.0.g668c5f7/swsusp.h 2013-03-03 02:47:03.715975438 +0200
++++ suspend-utils-1.0.g668c5f7/swsusp.h 2013-03-03 02:47:03.715975438 +0200
+@@ -9,6 +9,10 @@
+ *
+ */
+
++#ifdef __dietlibc__
++typedef uint32_t __kernel_loff_t;
++#endif
++
+ #include <stdint.h>
+ #include <linux/fs.h>
+ #include <linux/suspend_ioctls.h>
+@@ -115,6 +119,9 @@
return ioctl(dev, SNAPSHOT_PMOPS, PMOPS_FINISH);
}
@@ -51,7 +45,6 @@ diff -ur suspend/swsusp.h suspend-diet/swsusp.h
static inline void reboot(void)
{
syscall(SYS_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2,
-diff -ur suspend/vbetool/vbetool.c suspend-diet/vbetool/vbetool.c
--- suspend/vbetool/vbetool.c 2008-04-23 17:45:56.000000000 +0200
+++ suspend-diet/vbetool/vbetool.c 2009-04-06 15:10:05.000000000 +0200
@@ -8,6 +8,9 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/suspend-utils.git/commitdiff/8a440d208fa9521c1c35cb1a2ae3f547146945cb
More information about the pld-cvs-commit
mailing list