aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/520-squashfs_update_xz_comp_opts.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-10-27 18:14:39 +0000
committerRafał Miłecki <zajec5@gmail.com>2014-10-27 18:14:39 +0000
commit1c45c113c4aee13ca5a5cc30f357d2072a14b5e7 (patch)
tree89a6f12673d11ed2a89ac083a6c93ce47dad831c /target/linux/generic/patches-3.18/520-squashfs_update_xz_comp_opts.patch
parentac7e9e859bb08a7d8a9c82bed1d08abbf57b5ace (diff)
downloadupstream-1c45c113c4aee13ca5a5cc30f357d2072a14b5e7.tar.gz
upstream-1c45c113c4aee13ca5a5cc30f357d2072a14b5e7.tar.bz2
upstream-1c45c113c4aee13ca5a5cc30f357d2072a14b5e7.zip
kernel: start working on 3.18 support
This commit: 1) Copies 3.14 patches 2) Drops mainlined stuff 3) Modifies some patches to apply Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43093 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/520-squashfs_update_xz_comp_opts.patch')
-rw-r--r--target/linux/generic/patches-3.18/520-squashfs_update_xz_comp_opts.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.18/520-squashfs_update_xz_comp_opts.patch b/target/linux/generic/patches-3.18/520-squashfs_update_xz_comp_opts.patch
new file mode 100644
index 0000000000..ad11b30281
--- /dev/null
+++ b/target/linux/generic/patches-3.18/520-squashfs_update_xz_comp_opts.patch
@@ -0,0 +1,25 @@
+From f31b7c0efa255dd17a5f584022a319387f09b0d8 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jonas.gorski@gmail.com>
+Date: Tue, 12 Apr 2011 19:55:41 +0200
+Subject: [PATCH] squashfs: update xz compressor options struct.
+
+Update the xz compressor options struct to match the squashfs userspace
+one.
+---
+ fs/squashfs/xz_wrapper.c | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+--- a/fs/squashfs/xz_wrapper.c
++++ b/fs/squashfs/xz_wrapper.c
+@@ -40,8 +40,10 @@ struct squashfs_xz {
+ };
+
+ struct disk_comp_opts {
+- __le32 dictionary_size;
+ __le32 flags;
++ __le16 bit_opts;
++ __le16 fb;
++ __le32 dictionary_size;
+ };
+
+ struct comp_opts {