diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-08-22 10:20:15 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-08-22 10:20:15 -0400 |
| commit | 0b3ccf1fa57692b745503d53b8f7712250ecfb51 (patch) | |
| tree | 3a5a13e94ba6319470aa4d4fbc14ab532fd3c842 | |
| parent | 7252f6d902542bdd075d4b20380b5d5a00006265 (diff) | |
| download | kernel-0b3ccf1fa57692b745503d53b8f7712250ecfb51.tar.gz kernel-0b3ccf1fa57692b745503d53b8f7712250ecfb51.tar.xz kernel-0b3ccf1fa57692b745503d53b8f7712250ecfb51.zip | |
3.1-rc2-git9 snapshot
| -rw-r--r-- | btrfs-use-do_div.patch | 38 | ||||
| -rw-r--r-- | kernel.spec | 7 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 5 insertions, 42 deletions
diff --git a/btrfs-use-do_div.patch b/btrfs-use-do_div.patch deleted file mode 100644 index e32907ddb..000000000 --- a/btrfs-use-do_div.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Liu Bo <liubo2009 <at> cn.fujitsu.com> -Subject: [PATCH] Btrfs: use do_div to avoid compile errors on 32bit box -Date: 2011-08-19 09:48:44 GMT (3 hours and 36 minutes ago) - -When doing div operation of u64 type, we need to be careful and use do_div -to avoid compile ERROR on 32bit box: - -"ERROR: "__udivdi3" [fs/btrfs/btrfs.ko] undefined! -make[1]: *** [__modpost] Error 1 - -Signed-off-by: Liu Bo <liubo2009 <at> cn.fujitsu.com> ---- - fs/btrfs/extent-tree.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c -index 80d6148..9b495ce 100644 ---- a/fs/btrfs/extent-tree.c -+++ b/fs/btrfs/extent-tree.c -@@ -6796,14 +6796,14 @@ int btrfs_can_relocate(struct btrfs_root *root, u64 bytenr) - index = get_block_group_index(block_group); - if (index == 0) { - dev_min = 4; -- min_free /= 2; -+ do_div(min_free, 2); - } else if (index == 1) { - dev_min = 2; - } else if (index == 2) { - min_free *= 2; - } else if (index == 3) { - dev_min = fs_devices->rw_devices; -- min_free /= dev_min; -+ do_div(min_free, dev_min); - } - - mutex_lock(&root->fs_info->chunk_mutex); --- -1.6.5.2 diff --git a/kernel.spec b/kernel.spec index dd9960859..8edae8dc0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -84,7 +84,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 2 # The git snapshot level -%define gitrev 8 +%define gitrev 9 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -719,7 +719,6 @@ Patch12026: block-stray-block-put-after-teardown.patch Patch12027: usb-add-quirk-for-logitech-webcams.patch Patch12028: fix-perf-build.patch Patch12029: crypto-register-cryptd-first.patch -Patch12030: btrfs-use-do_div.patch # Runtime power management @@ -1348,7 +1347,6 @@ ApplyPatch usb-add-quirk-for-logitech-webcams.patch ApplyPatch fix-perf-build.patch ApplyPatch crypto-register-cryptd-first.patch -ApplyPatch btrfs-use-do_div.patch # Runtime PM #ApplyPatch linux-2.6-usb-pci-autosuspend.patch @@ -2074,6 +2072,9 @@ fi # ||----w | # || || %changelog +* Mon Aug 22 2011 Josh Boyer <jwboyer@redhat.com> +- Linux 3.1-rc2-git9 + * Sat Aug 20 2011 Josh Boyer <jwboyer@redhat.com> - Linux 3.1-rc2-git8 @@ -1,3 +1,3 @@ 398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2 f358c354ab6d3b0da1265b504f85ec50 patch-3.1-rc2.bz2 -46b4944282b3568751878d47e7d8f3cb patch-3.1-rc2-git8.bz2 +92d84bbc4f841e9164d9796c493c37bd patch-3.1-rc2-git9.bz2 |