diff options
8 files changed, 8 insertions, 90 deletions
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch deleted file mode 100644 index 3d79409233..0000000000 --- a/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b448a4e11127012a96bae8689e019879fbb8470f Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Mon, 28 Dec 2009 16:45:33 +0100 -Subject: [PATCH] pxafb: fix regression from d2a34c13e7ccec5d06eafd60e6f80ea531b34668 - -fbi->dev->platform_data is void * and gcc does not allow to access -!fbi->dev->platform_data->smart_update without cast platform_data to -(struct pxafb_mach_info) or assignment as used in this patch. - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - drivers/video/pxafb.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c -index 415858b..241468c 100644 ---- a/drivers/video/pxafb.c -+++ b/drivers/video/pxafb.c -@@ -1223,12 +1223,17 @@ static int pxafb_smart_thread(void *arg) - struct pxafb_info *fbi = arg; - struct pxafb_mach_info *inf; - -- if (!fbi || !fbi->dev->platform_data->smart_update) { -+ if (!fbi) { - pr_err("%s: not properly initialized, thread terminated\n", - __func__); - return -EINVAL; - } - inf = fbi->dev->platform_data; -+ if (!inf || !inf->smart_update) { -+ pr_err("%s: not properly initialized, thread terminated\n", -+ __func__); -+ return -EINVAL; -+ } - - pr_debug("%s(): task starting\n", __func__); - --- -1.6.6 - diff --git a/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/akita/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc4/akita/defconfig index a66b4b0a2f..a66b4b0a2f 100644 --- a/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/akita/defconfig +++ b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc4/akita/defconfig diff --git a/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/c7x0/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc4/c7x0/defconfig index 5b125baad0..5b125baad0 100644 --- a/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/c7x0/defconfig +++ b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc4/c7x0/defconfig diff --git a/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/spitz/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc4/spitz/defconfig index a66b4b0a2f..a66b4b0a2f 100644 --- a/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/spitz/defconfig +++ b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc4/spitz/defconfig diff --git a/recipes/kexecboot/linux-kexecboot_2.6.32+2.6.33-rc3.bb b/recipes/kexecboot/linux-kexecboot_2.6.32+2.6.33-rc4.bb index 1ebcc37152..301084eec1 100644 --- a/recipes/kexecboot/linux-kexecboot_2.6.32+2.6.33-rc3.bb +++ b/recipes/kexecboot/linux-kexecboot_2.6.32+2.6.33-rc4.bb @@ -1,6 +1,6 @@ require linux-kexecboot.inc -KERNEL_RELEASE = "2.6.33-rc3" +KERNEL_RELEASE = "2.6.33-rc4" OLD_KERNEL_RELEASE = "2.6.32" PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}" PR = "r1" @@ -17,12 +17,11 @@ DEFAULT_PREFERENCE_spitz = "1" DEFAULT_PREFERENCE_tosa = "-1" SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE}.tar.bz2;name=kernel \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_RELEASE}.bz2;name=rc3;patch=1 \ - file://0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_RELEASE}.bz2;name=rc4;patch=1 \ file://defconfig" -SRC_URI[rc3.md5sum] = "35defe2029ae5652efa74c6c28a5d0b9" -SRC_URI[rc3.sha256sum] = "437e39d06e6f51b2beb089a83f6671f9bd1d6fac0252a4adff9cff6f0592040e" +SRC_URI[rc4.md5sum] = "19c491f5ec00dbc96309044c784cde65" +SRC_URI[rc4.sha256sum] = "5ba62a8903a88e35ebe1f39354e1fd490ae7ebdc7dde4beedb8ac4f35dcdcd85" SRC_URI[kernel.md5sum] = "260551284ac224c3a43c4adac7df4879" SRC_URI[kernel.sha256sum] = "5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e" diff --git a/recipes/linux/linux-2.6.32+2.6.33-rc3/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch b/recipes/linux/linux-2.6.32+2.6.33-rc3/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch deleted file mode 100644 index 3d79409233..0000000000 --- a/recipes/linux/linux-2.6.32+2.6.33-rc3/0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b448a4e11127012a96bae8689e019879fbb8470f Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Mon, 28 Dec 2009 16:45:33 +0100 -Subject: [PATCH] pxafb: fix regression from d2a34c13e7ccec5d06eafd60e6f80ea531b34668 - -fbi->dev->platform_data is void * and gcc does not allow to access -!fbi->dev->platform_data->smart_update without cast platform_data to -(struct pxafb_mach_info) or assignment as used in this patch. - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - drivers/video/pxafb.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c -index 415858b..241468c 100644 ---- a/drivers/video/pxafb.c -+++ b/drivers/video/pxafb.c -@@ -1223,12 +1223,17 @@ static int pxafb_smart_thread(void *arg) - struct pxafb_info *fbi = arg; - struct pxafb_mach_info *inf; - -- if (!fbi || !fbi->dev->platform_data->smart_update) { -+ if (!fbi) { - pr_err("%s: not properly initialized, thread terminated\n", - __func__); - return -EINVAL; - } - inf = fbi->dev->platform_data; -+ if (!inf || !inf->smart_update) { -+ pr_err("%s: not properly initialized, thread terminated\n", -+ __func__); -+ return -EINVAL; -+ } - - pr_debug("%s(): task starting\n", __func__); - --- -1.6.6 - diff --git a/recipes/linux/linux-2.6.32+2.6.33-rc3/spitz/defconfig b/recipes/linux/linux-2.6.32+2.6.33-rc4/spitz/defconfig index 1aedc1219f..1aedc1219f 100644 --- a/recipes/linux/linux-2.6.32+2.6.33-rc3/spitz/defconfig +++ b/recipes/linux/linux-2.6.32+2.6.33-rc4/spitz/defconfig diff --git a/recipes/linux/linux_2.6.32+2.6.33-rc3.bb b/recipes/linux/linux_2.6.32+2.6.33-rc4.bb index c4593127a4..9015fd3da2 100644 --- a/recipes/linux/linux_2.6.32+2.6.33-rc3.bb +++ b/recipes/linux/linux_2.6.32+2.6.33-rc4.bb @@ -1,6 +1,6 @@ require linux.inc -KERNEL_RELEASE = "2.6.33-rc3" +KERNEL_RELEASE = "2.6.33-rc4" OLD_KERNEL_RELEASE = "2.6.32" PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}" PR = "r1" @@ -18,12 +18,11 @@ DEFAULT_PREFERENCE_spitz = "-1" DEFAULT_PREFERENCE_tosa = "-1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE}.tar.bz2;name=kernel \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_RELEASE}.bz2;name=rc3;patch=1 \ - file://0001-pxafb-fix-regression-from-d2a34c13e7ccec5d06eafd60e6.patch;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_RELEASE}.bz2;name=rc4;patch=1 \ file://defconfig" -SRC_URI[rc3.md5sum] = "35defe2029ae5652efa74c6c28a5d0b9" -SRC_URI[rc3.sha256sum] = "437e39d06e6f51b2beb089a83f6671f9bd1d6fac0252a4adff9cff6f0592040e" +SRC_URI[rc4.md5sum] = "19c491f5ec00dbc96309044c784cde65" +SRC_URI[rc4.sha256sum] = "5ba62a8903a88e35ebe1f39354e1fd490ae7ebdc7dde4beedb8ac4f35dcdcd85" SRC_URI[kernel.md5sum] = "260551284ac224c3a43c4adac7df4879" SRC_URI[kernel.sha256sum] = "5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e" |