Add from git://openlinux.windriver.com/people/paulg/modsplit-post-merge
These fix various build failures from the module.h split out stuff for 3.2
This commit is contained in:
Josh Boyer
parent
ea8a97de39
commit
dee356203f
@ -54,7 +54,7 @@ Summary: The Linux kernel
|
||||
# For non-released -rc kernels, this will be appended after the rcX and
|
||||
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
||||
#
|
||||
%global baserelease 1
|
||||
%global baserelease 2
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
@ -702,6 +702,8 @@ Patch21050: xfs-Fix-possible-memory-corruption-in-xfs_readlink.patch
|
||||
|
||||
Patch21070: oom-fix-integer-overflow-of-points.patch
|
||||
|
||||
Patch21071: modsplit-post-merge.patch
|
||||
|
||||
%endif
|
||||
|
||||
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
|
||||
@ -1323,6 +1325,8 @@ ApplyPatch utrace.patch
|
||||
#rhbz 750402
|
||||
ApplyPatch oom-fix-integer-overflow-of-points.patch
|
||||
|
||||
ApplyPatch modsplit-post-merge.patch
|
||||
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
%endif
|
||||
@ -2029,6 +2033,7 @@ fi
|
||||
* Mon Nov 07 2011 Josh Boyer <jwboyer@redhat.com>
|
||||
- Linux 3.1-git7
|
||||
- Drop override for XEN_MAX_DOMAIN_MEMORY (rhbz 751789)
|
||||
- Add fixes from git://openlinux.windriver.com/people/paulg/modsplit-post-merge
|
||||
|
||||
* Fri Nov 04 2011 Josh Boyer <jwboyer@redhat.com>
|
||||
- Linux 3.1-git6
|
||||
|
||||
156
modsplit-post-merge.patch
Normal file
156
modsplit-post-merge.patch
Normal file
@ -0,0 +1,156 @@
|
||||
From 15a91ab0dc89e3f6eaeb76d9fcf0d151c6b171c6 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Gortmaker <paul.gortmaker@windriver.com>
|
||||
Date: Sat, 8 Oct 2011 23:24:48 -0400
|
||||
Subject: [PATCH] arm: Add export.h to recently added files for EXPORT_SYMBOL
|
||||
|
||||
These files didn't exist at the time of the module.h split, and
|
||||
so were not fixed by the commits on that baseline. Since they use
|
||||
the EXPORT_SYMBOL and/or THIS_MODULE macros, they will need the
|
||||
new export.h file included that provides them.
|
||||
|
||||
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
||||
|
||||
diff --git a/arch/arm/plat-samsung/dma-ops.c b/arch/arm/plat-samsung/dma-ops.c
|
||||
index 6e3d9ab..93a994a 100644
|
||||
--- a/arch/arm/plat-samsung/dma-ops.c
|
||||
+++ b/arch/arm/plat-samsung/dma-ops.c
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <linux/errno.h>
|
||||
#include <linux/amba/pl330.h>
|
||||
#include <linux/scatterlist.h>
|
||||
+#include <linux/export.h>
|
||||
|
||||
#include <mach/dma.h>
|
||||
|
||||
diff --git a/arch/arm/plat-samsung/s3c-dma-ops.c b/arch/arm/plat-samsung/s3c-dma-ops.c
|
||||
index 582333c..7814949 100644
|
||||
--- a/arch/arm/plat-samsung/s3c-dma-ops.c
|
||||
+++ b/arch/arm/plat-samsung/s3c-dma-ops.c
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <linux/errno.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/types.h>
|
||||
+#include <linux/export.h>
|
||||
|
||||
#include <mach/dma.h>
|
||||
|
||||
--
|
||||
1.7.6
|
||||
|
||||
From 284e50580e13aa492677a987d1e4e3d72dd63c63 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Gortmaker <paul.gortmaker@windriver.com>
|
||||
Date: Wed, 28 Sep 2011 18:29:32 -0400
|
||||
Subject: [PATCH] drivers/md: change module.h -> export.h in
|
||||
persistent-data/dm-*
|
||||
|
||||
For the files which are not themselves modular, we can change
|
||||
them to include only the smaller export.h since all they are
|
||||
doing is looking for EXPORT_SYMBOL.
|
||||
|
||||
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
||||
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
||||
|
||||
diff --git a/drivers/md/persistent-data/dm-btree-remove.c b/drivers/md/persistent-data/dm-btree-remove.c
|
||||
index cdd71d6..e7071f6 100644
|
||||
--- a/drivers/md/persistent-data/dm-btree-remove.c
|
||||
+++ b/drivers/md/persistent-data/dm-btree-remove.c
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "dm-btree-internal.h"
|
||||
#include "dm-transaction-manager.h"
|
||||
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/export.h>
|
||||
|
||||
/*
|
||||
* Removing an entry from a btree
|
||||
diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c
|
||||
index ca16d5b..408b762 100644
|
||||
--- a/drivers/md/persistent-data/dm-btree.c
|
||||
+++ b/drivers/md/persistent-data/dm-btree.c
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "dm-space-map.h"
|
||||
#include "dm-transaction-manager.h"
|
||||
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/export.h>
|
||||
#include <linux/device-mapper.h>
|
||||
|
||||
#define DM_MSG_PREFIX "btree"
|
||||
diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c
|
||||
index 6229a4e..e6b9d67 100644
|
||||
--- a/drivers/md/persistent-data/dm-space-map-disk.c
|
||||
+++ b/drivers/md/persistent-data/dm-space-map-disk.c
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <linux/list.h>
|
||||
#include <linux/slab.h>
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/export.h>
|
||||
#include <linux/device-mapper.h>
|
||||
|
||||
#define DM_MSG_PREFIX "space map disk"
|
||||
diff --git a/drivers/md/persistent-data/dm-transaction-manager.c b/drivers/md/persistent-data/dm-transaction-manager.c
|
||||
index be594dd..e58e89e 100644
|
||||
--- a/drivers/md/persistent-data/dm-transaction-manager.c
|
||||
+++ b/drivers/md/persistent-data/dm-transaction-manager.c
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "dm-space-map-metadata.h"
|
||||
#include "dm-persistent-data-internal.h"
|
||||
|
||||
-#include <linux/module.h>
|
||||
+#include <linux/export.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/device-mapper.h>
|
||||
|
||||
--
|
||||
1.7.6
|
||||
|
||||
From 1193701b97f5dc4ca6a62a704dd55b058bfcf497 Mon Sep 17 00:00:00 2001
|
||||
From: Stephen Rothwell <sfr@canb.auug.org.au>
|
||||
Date: Tue, 1 Nov 2011 18:30:49 +1100
|
||||
Subject: [PATCH] device-mapper: dm-bufio.c needs to include module.h
|
||||
|
||||
since it uses the module facilities.
|
||||
|
||||
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
||||
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
||||
|
||||
diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c
|
||||
index cb24666..0a6806f 100644
|
||||
--- a/drivers/md/dm-bufio.c
|
||||
+++ b/drivers/md/dm-bufio.c
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/version.h>
|
||||
#include <linux/shrinker.h>
|
||||
+#include <linux/module.h>
|
||||
|
||||
#define DM_MSG_PREFIX "bufio"
|
||||
|
||||
--
|
||||
1.7.4.4
|
||||
|
||||
From 8f3a8c73998ac2f9294bba483002ac906f18b92a Mon Sep 17 00:00:00 2001
|
||||
From: Stephen Rothwell <sfr@canb.auug.org.au>
|
||||
Date: Tue, 1 Nov 2011 20:27:43 +1100
|
||||
Subject: [PATCH] device-mapper: using EXPORT_SYBOL in dm-space-map-checker.c
|
||||
needs export.h
|
||||
|
||||
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
||||
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
||||
|
||||
diff --git a/drivers/md/persistent-data/dm-space-map-checker.c b/drivers/md/persistent-data/dm-space-map-checker.c
|
||||
index bb44a93..50ed53b 100644
|
||||
--- a/drivers/md/persistent-data/dm-space-map-checker.c
|
||||
+++ b/drivers/md/persistent-data/dm-space-map-checker.c
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "dm-space-map-checker.h"
|
||||
|
||||
#include <linux/device-mapper.h>
|
||||
+#include <linux/export.h>
|
||||
|
||||
#ifdef CONFIG_DM_DEBUG_SPACE_MAPS
|
||||
|
||||
--
|
||||
1.7.4.4
|
||||
|
||||
Loading…
Reference in New Issue
Block a user