summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2006-07-05 14:42:28 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-07-05 14:42:28 +0000
commit5d8a0bb775ca7f2a68d55459ae58cd603175f9a6 (patch)
tree70c014fba2b29e24a990e47b94d62d2437a68659
parent97e1d6538b1f7396b13ac9cd14fb8092b26fb712 (diff)
parent4f65d22a891e1539625c9bd80ba0f133f5ef93fa (diff)
merge of 1ef406c4b198bad95e32551f7dbaf3d28aa7a399
and ef6b7850cf49731311d3e212e89cd13208ee8d3e
-rw-r--r--packages/linux/linux-openzaurus-2.6.16/squashfs3.0-2.6.15.patch7
-rw-r--r--packages/linux/linux-openzaurus-2.6.17+git/squashfs3.0-2.6.15.patch7
-rw-r--r--packages/linux/linux-openzaurus-2.6.17/squashfs3.0-2.6.15.patch7
-rw-r--r--packages/linux/linux-openzaurus_2.6.16.bb2
-rw-r--r--packages/linux/linux-openzaurus_2.6.17+git.bb2
-rw-r--r--packages/linux/linux-openzaurus_2.6.17.bb2
6 files changed, 15 insertions, 12 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.16/squashfs3.0-2.6.15.patch b/packages/linux/linux-openzaurus-2.6.16/squashfs3.0-2.6.15.patch
index f88dbbae8e..6fec9eba03 100644
--- a/packages/linux/linux-openzaurus-2.6.16/squashfs3.0-2.6.15.patch
+++ b/packages/linux/linux-openzaurus-2.6.16/squashfs3.0-2.6.15.patch
@@ -533,7 +533,7 @@ diff --new-file -urp linux-2.6.15/fs/squashfs/inode.c linux-2.6.15-squashfs3.0/f
+ *s, long long start_block,
+ int length)
+{
-+ int i, n;
++ int i, n, nf;
+ struct squashfs_sb_info *msblk = s->s_fs_info;
+
+ while ( 1 ) {
@@ -543,6 +543,8 @@ diff --new-file -urp linux-2.6.15/fs/squashfs/inode.c linux-2.6.15-squashfs3.0/f
+ msblk->fragment[i].block != start_block; i++);
+
+ if (i == SQUASHFS_CACHED_FRAGMENTS) {
++ nf = (msblk->next_fragment + 1) %
++ SQUASHFS_CACHED_FRAGMENTS;
+ for (i = msblk->next_fragment, n =
+ SQUASHFS_CACHED_FRAGMENTS; n &&
+ msblk->fragment[i].locked; n--, i = (i + 1) %
@@ -562,8 +564,7 @@ diff --new-file -urp linux-2.6.15/fs/squashfs/inode.c linux-2.6.15-squashfs3.0/f
+ &wait);
+ continue;
+ }
-+ msblk->next_fragment = (msblk->next_fragment + 1) %
-+ SQUASHFS_CACHED_FRAGMENTS;
++ msblk->next_fragment = nf;
+
+ if (msblk->fragment[i].data == NULL)
+ if (!(msblk->fragment[i].data = SQUASHFS_ALLOC
diff --git a/packages/linux/linux-openzaurus-2.6.17+git/squashfs3.0-2.6.15.patch b/packages/linux/linux-openzaurus-2.6.17+git/squashfs3.0-2.6.15.patch
index f88dbbae8e..6fec9eba03 100644
--- a/packages/linux/linux-openzaurus-2.6.17+git/squashfs3.0-2.6.15.patch
+++ b/packages/linux/linux-openzaurus-2.6.17+git/squashfs3.0-2.6.15.patch
@@ -533,7 +533,7 @@ diff --new-file -urp linux-2.6.15/fs/squashfs/inode.c linux-2.6.15-squashfs3.0/f
+ *s, long long start_block,
+ int length)
+{
-+ int i, n;
++ int i, n, nf;
+ struct squashfs_sb_info *msblk = s->s_fs_info;
+
+ while ( 1 ) {
@@ -543,6 +543,8 @@ diff --new-file -urp linux-2.6.15/fs/squashfs/inode.c linux-2.6.15-squashfs3.0/f
+ msblk->fragment[i].block != start_block; i++);
+
+ if (i == SQUASHFS_CACHED_FRAGMENTS) {
++ nf = (msblk->next_fragment + 1) %
++ SQUASHFS_CACHED_FRAGMENTS;
+ for (i = msblk->next_fragment, n =
+ SQUASHFS_CACHED_FRAGMENTS; n &&
+ msblk->fragment[i].locked; n--, i = (i + 1) %
@@ -562,8 +564,7 @@ diff --new-file -urp linux-2.6.15/fs/squashfs/inode.c linux-2.6.15-squashfs3.0/f
+ &wait);
+ continue;
+ }
-+ msblk->next_fragment = (msblk->next_fragment + 1) %
-+ SQUASHFS_CACHED_FRAGMENTS;
++ msblk->next_fragment = nf;
+
+ if (msblk->fragment[i].data == NULL)
+ if (!(msblk->fragment[i].data = SQUASHFS_ALLOC
diff --git a/packages/linux/linux-openzaurus-2.6.17/squashfs3.0-2.6.15.patch b/packages/linux/linux-openzaurus-2.6.17/squashfs3.0-2.6.15.patch
index f88dbbae8e..6fec9eba03 100644
--- a/packages/linux/linux-openzaurus-2.6.17/squashfs3.0-2.6.15.patch
+++ b/packages/linux/linux-openzaurus-2.6.17/squashfs3.0-2.6.15.patch
@@ -533,7 +533,7 @@ diff --new-file -urp linux-2.6.15/fs/squashfs/inode.c linux-2.6.15-squashfs3.0/f
+ *s, long long start_block,
+ int length)
+{
-+ int i, n;
++ int i, n, nf;
+ struct squashfs_sb_info *msblk = s->s_fs_info;
+
+ while ( 1 ) {
@@ -543,6 +543,8 @@ diff --new-file -urp linux-2.6.15/fs/squashfs/inode.c linux-2.6.15-squashfs3.0/f
+ msblk->fragment[i].block != start_block; i++);
+
+ if (i == SQUASHFS_CACHED_FRAGMENTS) {
++ nf = (msblk->next_fragment + 1) %
++ SQUASHFS_CACHED_FRAGMENTS;
+ for (i = msblk->next_fragment, n =
+ SQUASHFS_CACHED_FRAGMENTS; n &&
+ msblk->fragment[i].locked; n--, i = (i + 1) %
@@ -562,8 +564,7 @@ diff --new-file -urp linux-2.6.15/fs/squashfs/inode.c linux-2.6.15-squashfs3.0/f
+ &wait);
+ continue;
+ }
-+ msblk->next_fragment = (msblk->next_fragment + 1) %
-+ SQUASHFS_CACHED_FRAGMENTS;
++ msblk->next_fragment = nf;
+
+ if (msblk->fragment[i].data == NULL)
+ if (!(msblk->fragment[i].data = SQUASHFS_ALLOC
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index 08a64160c1..930b6adcce 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,6 +1,6 @@
include linux-openzaurus.inc
-PR = "r38"
+PR = "r39"
# Handy URLs
# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
diff --git a/packages/linux/linux-openzaurus_2.6.17+git.bb b/packages/linux/linux-openzaurus_2.6.17+git.bb
index 0e4676e764..b33625932f 100644
--- a/packages/linux/linux-openzaurus_2.6.17+git.bb
+++ b/packages/linux/linux-openzaurus_2.6.17+git.bb
@@ -1,6 +1,6 @@
include linux-openzaurus.inc
-PR = "r2"
+PR = "r3"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb
index 2a34a6614d..197be8419d 100644
--- a/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/packages/linux/linux-openzaurus_2.6.17.bb
@@ -1,6 +1,6 @@
include linux-openzaurus.inc
-PR = "r5"
+PR = "r6"
DEFAULT_PREFERENCE = "-1"