rpms/kernel/F-11 linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch, NONE, 1.1 linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch, NONE, 1.1 kernel.spec, 1.1726, 1.1727 lirc-2.6.31.patch, 1.2, 1.3

Fri Sep 4 17:47:08 UTC 2009

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18474

Modified Files:
	kernel.spec lirc-2.6.31.patch 
Added Files:
	linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch 
	linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch 
Log Message:
Added additional fixes needed for #514787:
  linux-2.6-ppc64-vs-broadcom-lmb-no-init-*.patch
Fix up lirc patch context so it applies.

linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch:
 lmb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch ---
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Thu, 27 Aug 2009 07:20:30 +0000 (+1000)
Subject: lmb: Remove __init from lmb_end_of_DRAM()
X-Git-Tag: v2.6.31-rc8~5
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4f8ee2c9cc0e885d2bb50ef26db66150ab25213e

lmb: Remove __init from lmb_end_of_DRAM()

We call lmb_end_of_DRAM() to test whether a DMA mask is ok on a machine
without IOMMU, but this function is marked as __init.

I don't think there's a clean way to get the top of RAM max_pfn doesn't
appear to include highmem or I missed (or we have a bug :-) so for now,
let's just avoid having a broken 2.6.31 by making this function
non-__init and we can revisit later.

Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/lib/lmb.c b/lib/lmb.c
index e4a6482..0343c05 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -429,7 +429,7 @@ u64 __init lmb_phys_mem_size(void)
 	return lmb.memory.size;
 }
 
-u64 __init lmb_end_of_DRAM(void)
+u64 lmb_end_of_DRAM(void)
 {
 	int idx = lmb.memory.cnt - 1;
 

linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch:
 lmb.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch ---
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon, 31 Aug 2009 03:48:16 +0000 (+1000)
Subject: lmb: Also remove __init from lmb_end_of_RAM() declaration in lmb.h
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=1a37f184fa7824982a5f434c06981ec46a66cef7

lmb: Also remove __init from lmb_end_of_RAM() declaration in lmb.h

My previous patch (commit 4f8ee2c9cc: "lmb: Remove __init from
lmb_end_of_DRAM()") removed __init in lmb.c but missed the fact that it
was also marked as such in the .h

Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---

diff --git a/include/linux/lmb.h b/include/linux/lmb.h
index c46c895..2442e3f 100644
--- a/include/linux/lmb.h
+++ b/include/linux/lmb.h
@@ -51,7 +51,7 @@ extern u64 __init lmb_alloc_base(u64 size,
 extern u64 __init __lmb_alloc_base(u64 size,
 		u64 align, u64 max_addr);
 extern u64 __init lmb_phys_mem_size(void);
-extern u64 __init lmb_end_of_DRAM(void);
+extern u64 lmb_end_of_DRAM(void);
 extern void __init lmb_enforce_memory_limit(u64 memory_limit);
 extern int __init lmb_is_reserved(u64 addr);
 extern int lmb_find(struct lmb_property *res);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1726
retrieving revision 1.1727
diff -u -p -r1.1726 -r1.1727
--- kernel.spec	2 Sep 2009 04:21:36 -0000	1.1726
+++ kernel.spec	4 Sep 2009 17:47:08 -0000	1.1727
@@ -604,8 +604,10 @@ Patch83: linux-2.6-mm-lru-dont-evict-map
 Patch141: linux-2.6-ps3-storage-alias.patch
 Patch143: linux-2.6-g5-therm-shutdown.patch
 Patch144: linux-2.6-vio-modalias.patch
-Patch147: linux-2.6-imac-transparent-bridge.patch
-Patch148: linux-2.6-ppc64-vs-broadcom.patch
+Patch145: linux-2.6-imac-transparent-bridge.patch
+Patch146: linux-2.6-ppc64-vs-broadcom.patch
+Patch147: linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch
+Patch148: linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch
 
 Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
 
@@ -1197,7 +1199,9 @@ ApplyPatch linux-2.6-vio-modalias.patch
 ApplyPatch linux-2.6-imac-transparent-bridge.patch
 # Fix b43 support on no-iommu devices with <1GiB RAM
 ApplyPatch linux-2.6-ppc64-vs-broadcom.patch
- 
+ApplyPatch linux-2.6-ppc64-vs-broadcom-lmb-no-init-1.patch 
+ApplyPatch linux-2.6-ppc64-vs-broadcom-lmb-no-init-2.patch 
+
 #
 # SPARC64
 #
@@ -1977,6 +1981,11 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 04 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-48
+- Added additional fixes needed for #514787:
+  linux-2.6-ppc64-vs-broadcom-lmb-no-init-*.patch
+- Fix up lirc patch context so it applies.
+
 * Wed Sep 02 2009 Jarod Wilson <jarod at redhat.com>
 - Make it possible to rmmod lirc_zilog w/o it hanging indefinitely
 - Add transmit support (via port 2 only) on 1st-gen mceusb transceiver

lirc-2.6.31.patch:
 MAINTAINERS                           |    9 
 drivers/input/Kconfig                 |    2 
 drivers/input/Makefile                |    2 
 drivers/input/lirc/Kconfig            |  119 +
 drivers/input/lirc/Makefile           |   21 
 drivers/input/lirc/lirc.h             |  100 +
 drivers/input/lirc/lirc_bt829.c       |  383 +++++
 drivers/input/lirc/lirc_dev.c         |  839 ++++++++++++
 drivers/input/lirc/lirc_dev.h         |  184 ++
 drivers/input/lirc/lirc_ene0100.c     |  644 +++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 ++
 drivers/input/lirc/lirc_i2c.c         |  537 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  556 ++++++++
 drivers/input/lirc/lirc_imon.c        | 2301 ++++++++++++++++++++++++++++++++++
 drivers/input/lirc/lirc_it87.c        |  986 ++++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 +
 drivers/input/lirc/lirc_ite8709.c     |  539 +++++++
 drivers/input/lirc/lirc_mceusb.c      | 1243 ++++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 ++++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 
 drivers/input/lirc/lirc_sasem.c       |  931 +++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1316 +++++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1283 ++++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  794 +++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1395 ++++++++++++++++++++
 26 files changed, 15601 insertions(+)

Index: lirc-2.6.31.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/lirc-2.6.31.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- lirc-2.6.31.patch	2 Sep 2009 04:21:37 -0000	1.2
+++ lirc-2.6.31.patch	4 Sep 2009 17:47:08 -0000	1.3
@@ -53,8 +53,8 @@ index 8dca9d8..f25dc26 100644
 +S:	Maintained
 +
  LINUX SECURITY MODULE (LSM) FRAMEWORK
- M:	Chris Wright <chrisw at sous-sol.org>
- L:	linux-security-module at vger.kernel.org
+ P:	Chris Wright
+ M:	chrisw at sous-sol.org
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index cd50c00..442f94f 100644
 --- a/drivers/input/Kconfig


