summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Brix Andersen <brix@gentoo.org>2005-12-29 23:18:02 +0000
committerHenrik Brix Andersen <brix@gentoo.org>2005-12-29 23:18:02 +0000
commite3bf0ae42b0c786a33dd7dbb6d8497c2213b0485 (patch)
treebaace601dc227dae6ff3a7152790979556c20f8f /sys-kernel/suspend2-sources/files
parentFix check to ensure both ldap and kerberos, not either. Bug #117041 (diff)
downloadhistorical-e3bf0ae42b0c786a33dd7dbb6d8497c2213b0485.tar.gz
historical-e3bf0ae42b0c786a33dd7dbb6d8497c2213b0485.tar.bz2
historical-e3bf0ae42b0c786a33dd7dbb6d8497c2213b0485.zip
Revision bump to genpatches-2.6.14-7 and updated mce-config.patch.
Package-Manager: portage-2.0.53
Diffstat (limited to 'sys-kernel/suspend2-sources/files')
-rw-r--r--sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r94
-rw-r--r--sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-mce-config-2.patch30
-rw-r--r--sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-processor.h.patch14
3 files changed, 48 insertions, 0 deletions
diff --git a/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r9 b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r9
new file mode 100644
index 000000000000..d0a1daac0021
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/digest-suspend2-sources-2.6.14-r9
@@ -0,0 +1,4 @@
+MD5 6089934d545add3a13cda2b32127af95 genpatches-2.6.14-7.base.tar.bz2 52548
+MD5 44829e05b45d03c70ddf794fece4c202 genpatches-2.6.14-7.extras.tar.bz2 143076
+MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170
+MD5 a390d689dc5de91222f905cae7d0d406 suspend2-2.2-rc15-for-2.6.14.tar.bz2 113332
diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-mce-config-2.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-mce-config-2.patch
new file mode 100644
index 000000000000..90f58941be3b
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-mce-config-2.patch
@@ -0,0 +1,30 @@
+Hi.
+
+I have a better solution to the mce reinit issue. This patch also
+removes the warning that the previous iteration created.
+
+Regards,
+
+Nigel
+
+ suspend2.h | 1 +
+ 1 files changed, 1 insertion(+)
+diff -ruNp 9010-mce-config.patch-old/include/asm-i386/suspend2.h 9010-mce-config.patch-new/include/asm-i386/suspend2.h
+--- 9010-mce-config.patch-old/include/asm-i386/suspend2.h 2005-12-28 09:59:00.000000000 +1000
++++ 9010-mce-config.patch-new/include/asm-i386/suspend2.h 2005-12-28 07:03:07.000000000 +1000
+@@ -10,6 +10,7 @@
+ #include <asm/i387.h>
+ #include <asm/tlbflush.h>
+ #include <asm/desc.h>
++#include <asm/processor.h>
+
+ /* image of the saved processor states */
+ struct suspend2_saved_context {
+
+
+
+_______________________________________________
+Suspend2-devel mailing list
+Suspend2-devel@lists.suspend2.net
+http://lists.suspend2.net/mailman/listinfo/suspend2-devel
+
diff --git a/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-processor.h.patch b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-processor.h.patch
new file mode 100644
index 000000000000..5ea203e7855e
--- /dev/null
+++ b/sys-kernel/suspend2-sources/files/suspend2-2.2-rc15-processor.h.patch
@@ -0,0 +1,14 @@
+diff -ruNp 9011-processor.h.patch-old/include/asm-i386/processor.h 9011-processor.h.patch-new/include/asm-i386/processor.h
+--- 9011-processor.h.patch-old/include/asm-i386/processor.h 2005-10-28 02:02:08.000000000 +0200
++++ 9011-processor.h.patch-new/include/asm-i386/processor.h 2005-12-29 21:40:37.000000000 +0100
+@@ -718,4 +718,10 @@ extern void mtrr_bp_init(void);
+ #define mtrr_bp_init() do {} while (0)
+ #endif
+
++#ifdef CONFIG_X86_MCE
++extern void mcheck_init(struct cpuinfo_x86 *c);
++#else
++#define mcheck_init(c) do {} while(0)
++#endif
++
+ #endif /* __ASM_I386_PROCESSOR_H */