aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-08-02 11:02:35 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-08-02 11:02:35 +0000
commit3fe782dddf23ba8287c4752d44f184e7149ef966 (patch)
tree2ebc1f6e614c6edae352c5af8b54b374dea11e44 /target/linux/generic-2.6
parent9d1e01a1597aea8d5afe386deba80aa888d44bff (diff)
downloadupstream-3fe782dddf23ba8287c4752d44f184e7149ef966.tar.gz
upstream-3fe782dddf23ba8287c4752d44f184e7149ef966.tar.bz2
upstream-3fe782dddf23ba8287c4752d44f184e7149ef966.zip
refresh 2.6.30 patches
SVN-Revision: 17093
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch10
3 files changed, 8 insertions, 10 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch b/target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch
index 068d850ef0..b7214b9d6d 100644
--- a/target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch
@@ -9,11 +9,9 @@ Date: Fri Jul 31 18:26:48 2009 +0200
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
-diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
-index 28346fb..639333a 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
-@@ -220,6 +220,9 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
+@@ -220,6 +220,9 @@ int snd_soc_jack_add_gpios(struct snd_so
if (ret)
goto err;
@@ -23,7 +21,7 @@ index 28346fb..639333a 100644
ret = request_irq(gpio_to_irq(gpios[i].gpio),
gpio_handler,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-@@ -227,9 +230,6 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
+@@ -227,9 +230,6 @@ int snd_soc_jack_add_gpios(struct snd_so
&gpios[i]);
if (ret)
goto err;
diff --git a/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch
index 8ade08a8b6..eaf89da3f5 100644
--- a/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch
@@ -70,7 +70,7 @@
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -5665,6 +5665,7 @@ int can_nice(const struct task_struct *p
+@@ -5666,6 +5666,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
capable(CAP_SYS_NICE));
}
diff --git a/target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch b/target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch
index f334e23af5..336c13ac73 100644
--- a/target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch
@@ -6,9 +6,9 @@
quiet_cmd_lzma = LZMA $@
-cmd_lzma = (lzma -9 -c $< && $(size_append) $<) >$@ || (rm -f $@ ; false)
+cmd_lzma = lzma e $< $@ -lc1 -lp2 -pb2 -eos
---- a/scripts/gen_initramfs_list.sh 2009-06-10 05:05:27.000000000 +0200
-+++ b/scripts/gen_initramfs_list.sh 2009-08-01 18:36:14.000000000 +0200
-@@ -225,7 +225,7 @@
+--- a/scripts/gen_initramfs_list.sh
++++ b/scripts/gen_initramfs_list.sh
+@@ -225,7 +225,7 @@ cpio_list=
output="/dev/stdout"
output_file=""
is_cpio_compressed=
@@ -17,7 +17,7 @@
arg="$1"
case "$arg" in
-@@ -239,9 +239,9 @@
+@@ -239,9 +239,9 @@ case "$arg" in
output_file="$1"
cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
output=${cpio_list}
@@ -30,7 +30,7 @@
echo "$output_file" | grep -q "\.cpio$" && compr="cat"
shift
;;
-@@ -292,7 +292,7 @@
+@@ -292,7 +292,7 @@ if [ ! -z ${output_file} ]; then
if [ "${is_cpio_compressed}" = "compressed" ]; then
cat ${cpio_tfile} > ${output_file}
else