Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2010-04-22 15:18:20 -0400
committerJeff Mahoney <jeffm@suse.com>2010-04-22 15:18:20 -0400
commit72f7d49ac45380c1b71bd38e86c3bbf74577b9f6 (patch)
tree9b93df2b02369ec4a4f8bb605ba81679590586cd
parent1fc2030ec11d5382c04d0dc4c44911c6fd53e3f4 (diff)
- patches.suse/s390-Kerntypes.diff: Fix slab.h vs slab_def.hrpm-2.6.34-6--openSUSE-11.3-Milestone6rpm-2.6.34-6
include ordering in kerntypes.c
-rw-r--r--kernel-source.changes6
-rw-r--r--patches.suse/s390-Kerntypes.diff2
2 files changed, 7 insertions, 1 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index 73b232aea8..b40ba388c1 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Apr 22 21:18:11 CEST 2010 - jeffm@suse.com
+
+- patches.suse/s390-Kerntypes.diff: Fix slab.h vs slab_def.h
+ include ordering in kerntypes.c
+
+-------------------------------------------------------------------
Thu Apr 22 09:47:57 CEST 2010 - mmarek@suse.cz
- rpm/kernel-*.spec.in: Provide %name = %version-%source_rel in
diff --git a/patches.suse/s390-Kerntypes.diff b/patches.suse/s390-Kerntypes.diff
index e413f25b65..a6994bab39 100644
--- a/patches.suse/s390-Kerntypes.diff
+++ b/patches.suse/s390-Kerntypes.diff
@@ -96,6 +96,7 @@ Signed-off-by: Michal Marek <mmarek@suse.cz>
+#include <linux/module.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
++#include <linux/slab.h>
+#ifdef CONFIG_SLUB
+ #include <linux/slub_def.h>
+#endif
@@ -105,7 +106,6 @@ Signed-off-by: Michal Marek <mmarek@suse.cz>
+#ifdef CONFIG_SLQB
+ #include <linux/slqb_def.h>
+#endif
-+#include <linux/slab.h>
+#include <linux/bio.h>
+#include <linux/bitmap.h>
+#include <linux/bitops.h>