.33 fixes

diff --git a/queue-2.6.33/lockdep-fix-incorrect-percpu-usage.patch b/queue-2.6.33/lockdep-fix-incorrect-percpu-usage.patch
index 1b55fcb703fadd1b3aff4c1b7b1ba4e4104c00d2..32fec21c7acd4070f99c619b8577eccfe1c5c465 100644 (file)
--- a/queue-2.6.33/lockdep-fix-incorrect-percpu-usage.patch
+++ b/queue-2.6.33/lockdep-fix-incorrect-percpu-usage.patch
@@ -56,8 +56,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 -              end   = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM
 -                                      + per_cpu_offset(i);
 +              start = (unsigned long) per_cpu_ptr(&__per_cpu_start, i);
-+              end   = (unsigned long) per_cpu_ptr(&__per_cpu_start
-+                                                  + PERCPU_ENOUGH_ROOM, i);
++              end   = (unsigned long) per_cpu_ptr(&__per_cpu_start, i)
++                                      + PERCPU_ENOUGH_ROOM;
  
                if ((addr >= start) && (addr < end))
                        return 1;

diff --git a/queue-2.6.33/md-raid5-allow-for-more-than-2-31-chunks.patch b/queue-2.6.33/md-raid5-allow-for-more-than-2-31-chunks.patch
deleted file mode 100644 (file)
index f8b37ba..0000000
--- a/queue-2.6.33/md-raid5-allow-for-more-than-2-31-chunks.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 35f2a591192d0a5d9f7fc696869c76f0b8e49c3d Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb@suse.de>
-Date: Tue, 20 Apr 2010 14:13:34 +1000
-Subject: md/raid5: allow for more than 2^31 chunks.
-
-From: NeilBrown <neilb@suse.de>
-
-commit 35f2a591192d0a5d9f7fc696869c76f0b8e49c3d upstream.
-
-With many large drives and small chunk sizes it is possible
-to create a RAID5 with more than 2^31 chunks.  Make sure this
-works.
-
-Reported-by: Brett King <king.br@gmail.com>
-Signed-off-by: NeilBrown <neilb@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/md/raid5.c |   19 +++++++------------
- 1 file changed, 7 insertions(+), 12 deletions(-)
-
---- a/drivers/md/raid5.c
-+++ b/drivers/md/raid5.c
-@@ -1649,8 +1649,8 @@ static sector_t raid5_compute_sector(rai
-                                    int previous, int *dd_idx,
-                                    struct stripe_head *sh)
- {
--      long stripe;
--      unsigned long chunk_number;
-+      sector_t stripe;
-+      sector_t chunk_number;
-       unsigned int chunk_offset;
-       int pd_idx, qd_idx;
-       int ddf_layout = 0;
-@@ -1670,17 +1670,12 @@ static sector_t raid5_compute_sector(rai
-        */
-       chunk_offset = sector_div(r_sector, sectors_per_chunk);
-       chunk_number = r_sector;
--      BUG_ON(r_sector != chunk_number);
- 
-       /*
-        * Compute the stripe number
-        */
--      stripe = chunk_number / data_disks;
--
--      /*
--       * Compute the data disk and parity disk indexes inside the stripe
--       */
--      *dd_idx = chunk_number % data_disks;
-+      stripe = chunk_number;
-+      *dd_idx = sector_div(stripe, data_disks);
- 
-       /*
-        * Select the parity disk based on the user selected algorithm.
-@@ -1869,14 +1864,14 @@ static sector_t compute_blocknr(struct s
-                                : conf->algorithm;
-       sector_t stripe;
-       int chunk_offset;
--      int chunk_number, dummy1, dd_idx = i;
-+      sector_t chunk_number;
-+      int dummy1, dd_idx = i;
-       sector_t r_sector;
-       struct stripe_head sh2;
- 
- 
-       chunk_offset = sector_div(new_sector, sectors_per_chunk);
-       stripe = new_sector;
--      BUG_ON(new_sector != stripe);
- 
-       if (i == sh->pd_idx)
-               return 0;
-@@ -1969,7 +1964,7 @@ static sector_t compute_blocknr(struct s
-       }
- 
-       chunk_number = stripe * data_disks + i;
--      r_sector = (sector_t)chunk_number * sectors_per_chunk + chunk_offset;
-+      r_sector = chunk_number * sectors_per_chunk + chunk_offset;
- 
-       check = raid5_compute_sector(conf, r_sector,
-                                    previous, &dummy1, &sh2);

diff --git a/queue-2.6.33/r8169-clean-up-my-printk-uglyness.patch b/queue-2.6.33/r8169-clean-up-my-printk-uglyness.patch
new file mode 100644 (file)
index 0000000..d85ce46
--- /dev/null
+++ b/queue-2.6.33/r8169-clean-up-my-printk-uglyness.patch
@@ -0,0 +1,36 @@
+From 93f4d91d879acfcb0ba9c2725e3133fcff2dfd1e Mon Sep 17 00:00:00 2001
+From: Neil Horman <nhorman@tuxdriver.com>
+Date: Thu, 1 Apr 2010 07:30:07 +0000
+Subject: r8169: clean up my printk uglyness
+
+From: Neil Horman <nhorman@tuxdriver.com>
+
+commit 93f4d91d879acfcb0ba9c2725e3133fcff2dfd1e upstream.
+
+Fix formatting on r8169 printk
+
+Brandon Philips noted that I had a spacing issue in my printk for the
+last r8169 patch that made it quite ugly.  Fix that up and add the PFX
+macro to it as well so it looks like the other r8169 printks
+
+Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/r8169.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/r8169.c
++++ b/drivers/net/r8169.c
+@@ -3255,8 +3255,8 @@ static void rtl8169_set_rxbufsize(struct
+       unsigned int max_frame = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
+ 
+       if (max_frame != 16383)
+-              printk(KERN_WARNING "WARNING! Changing of MTU on this NIC"
+-                      "May lead to frame reception errors!\n");
++              printk(KERN_WARNING PFX "WARNING! Changing of MTU on this "
++                      "NIC may lead to frame reception errors!\n");
+ 
+       tp->rx_buf_sz = (max_frame > RX_BUF_SIZE) ? max_frame : RX_BUF_SIZE;
+ }

diff --git a/queue-2.6.33/series b/queue-2.6.33/series
index 2ea44ca164c51ba999fa5f6317f7d2bb98e60f19..3bf13c4bfe4c2f23c656b9f64eab59d6aa89215f 100644 (file)
--- a/queue-2.6.33/series
+++ b/queue-2.6.33/series
@@ -117,7 +117,6 @@ xfs-non-blocking-inode-locking-in-io-completion.patch
 xfs-fix-locking-for-inode-cache-radix-tree-tag-updates.patch
 xfs-check-for-more-work-before-sleeping-in-xfssyncd.patch
 acpi-ec-allow-multibyte-access-to-ec.patch
-md-raid5-allow-for-more-than-2-31-chunks.patch
 acpi-ec-limit-burst-to-64-bits.patch
 modules-fix-incorrect-percpu-usage.patch
 lockdep-fix-incorrect-percpu-usage.patch
@@ -137,3 +136,4 @@ sched-use-proper-type-in-sched_getaffinity.patch
 0009-KVM-x86-Fix-TSS-size-check-for-16-bit-tasks.patch
 x86-gart-disable-gart-explicitly-before-initialization.patch
 mips-sibyte-fix-m3-tlb-exception-handler-workaround.patch
+r8169-clean-up-my-printk-uglyness.patch