[kernel] r19724 - in dists/squeeze/linux-2.6/debian: . patches/bugfix/ia64 patches/series

[Ben Hutchings]

Author: benh
Date: Sat Jan 12 21:32:27 2013
New Revision: 19724

Log:
[ia64] Revert "pcdp: use early_ioremap/early_iounmap to access pcdp table", which breaks compilation of this driver

Added:
   dists/squeeze/linux-2.6/debian/patches/bugfix/ia64/revert-pcdp-use-early_ioremap-early_iounmap-to-acces.patch
Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/patches/series/47

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Sat Jan 12 21:29:35 2013	(r19723)
+++ dists/squeeze/linux-2.6/debian/changelog	Sat Jan 12 21:32:27 2013	(r19724)
@@ -74,6 +74,8 @@
       + dmi: Feed DMI table to /dev/random driver
     For the complete list of changes, see:
      http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.32/ChangeLog-2.6.32.60
+    - [ia64] Revert "pcdp: use early_ioremap/early_iounmap to access pcdp
+      table", which breaks compilation of this driver
   * [x86] Don't use the EFI reboot method by default (Closes: #626022)
   * [x86] drm/i915: Attempt to fix watermark setup on 85x (v2)
     (Closes: #661696)

Added: dists/squeeze/linux-2.6/debian/patches/bugfix/ia64/revert-pcdp-use-early_ioremap-early_iounmap-to-acces.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/ia64/revert-pcdp-use-early_ioremap-early_iounmap-to-acces.patch	Sat Jan 12 21:32:27 2013	(r19724)
@@ -0,0 +1,40 @@
+From 9f10d301a441cfe32aeb55cf3181cbd70fa33564 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sat, 12 Jan 2013 21:04:48 +0000
+Subject: [PATCH] Revert "pcdp: use early_ioremap/early_iounmap to access pcdp
+ table"
+
+This reverts commit 2af3af56e7d4756b21a2e0d86e4fc4e5b7f0df24, which was
+commit 6c4088ac3a4d82779903433bcd5f048c58fb1aca upstream.
+
+This was purported to be a fix for x86_64 systems, but this driver
+cannot even be selected on x86_64, even in current mainline!
+Additionally, the early_io{remap,unmap}() functions were not defined
+for ia64 until Linux 2.6.33.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/firmware/pcdp.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/firmware/pcdp.c b/drivers/firmware/pcdp.c
+index a330492..51e0e2d 100644
+--- a/drivers/firmware/pcdp.c
++++ b/drivers/firmware/pcdp.c
+@@ -95,7 +95,7 @@ efi_setup_pcdp_console(char *cmdline)
+ 	if (efi.hcdp == EFI_INVALID_TABLE_ADDR)
+ 		return -ENODEV;
+ 
+-	pcdp = early_ioremap(efi.hcdp, 4096);
++	pcdp = ioremap(efi.hcdp, 4096);
+ 	printk(KERN_INFO "PCDP: v%d at 0x%lx\n", pcdp->rev, efi.hcdp);
+ 
+ 	if (strstr(cmdline, "console=hcdp")) {
+@@ -131,6 +131,6 @@ efi_setup_pcdp_console(char *cmdline)
+ 	}
+ 
+ out:
+-	early_iounmap(pcdp, 4096);
++	iounmap(pcdp);
+ 	return rc;
+ }

Modified: dists/squeeze/linux-2.6/debian/patches/series/47
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/47	Sat Jan 12 21:29:35 2013	(r19723)
+++ dists/squeeze/linux-2.6/debian/patches/series/47	Sat Jan 12 21:32:27 2013	(r19724)
@@ -163,6 +163,7 @@
 - bugfix/x86/kvm-prevent-starting-pit-timers-in-the-absence-of-irqchip-support.patch
 - bugfix/all/xfs-fix-possible-memory-corruption-in-xfs_readlink.patch
 + bugfix/all/stable/2.6.32.60.patch
++ bugfix/ia64/revert-pcdp-use-early_ioremap-early_iounmap-to-acces.patch
 + debian/security-Avoid-ABI-change-due-to-personality.h-include.patch
 + debian/timer-Avoid_ABI-change-from-leap-second-fix.patch
 + bugfix/all/hugetlb-fix-resv_map-leak-in-error-path.patch