diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-09-16 07:56:33 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-09-16 07:56:33 +0000 |
commit | f74116e59942d9773459b1de0882901b21f60bbd (patch) | |
tree | 5fdd971d923e1d6665354541e735c0edb0f66afa /target/linux/omap24xx/patches-3.3/309-omapfb-circular-mutex-workaround.patch | |
parent | e2ffe8f1b9568f94340d78ec6c314582388b0332 (diff) | |
download | upstream-f74116e59942d9773459b1de0882901b21f60bbd.tar.gz upstream-f74116e59942d9773459b1de0882901b21f60bbd.tar.bz2 upstream-f74116e59942d9773459b1de0882901b21f60bbd.zip |
omap24xx: remove obsolete kernel 3.3 patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 46947
Diffstat (limited to 'target/linux/omap24xx/patches-3.3/309-omapfb-circular-mutex-workaround.patch')
-rw-r--r-- | target/linux/omap24xx/patches-3.3/309-omapfb-circular-mutex-workaround.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/target/linux/omap24xx/patches-3.3/309-omapfb-circular-mutex-workaround.patch b/target/linux/omap24xx/patches-3.3/309-omapfb-circular-mutex-workaround.patch deleted file mode 100644 index e5e083e241..0000000000 --- a/target/linux/omap24xx/patches-3.3/309-omapfb-circular-mutex-workaround.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/drivers/video/omap/omapfb_main.c -+++ b/drivers/video/omap/omapfb_main.c -@@ -420,10 +420,10 @@ static void set_fb_fix(struct fb_info *f - fbi->screen_base = rg->vaddr; - - if (!from_init) { -- mutex_lock(&fbi->mm_lock); -+ preempt_disable(); - fix->smem_start = rg->paddr; - fix->smem_len = rg->size; -- mutex_unlock(&fbi->mm_lock); -+ preempt_enable(); - } else { - fix->smem_start = rg->paddr; - fix->smem_len = rg->size; -@@ -933,10 +933,10 @@ static int omapfb_setup_mem(struct fb_in - * plane memory is dealloce'd, the other - * screen parameters in var / fix are invalid. - */ -- mutex_lock(&fbi->mm_lock); -+ preempt_disable(); - fbi->fix.smem_start = 0; - fbi->fix.smem_len = 0; -- mutex_unlock(&fbi->mm_lock); -+ preempt_enable(); - } - } - } ---- a/drivers/video/fbmem.c -+++ b/drivers/video/fbmem.c -@@ -1383,8 +1383,10 @@ fb_mmap(struct file *file, struct vm_are - } - - /* frame buffer memory */ -+ preempt_disable(); - start = info->fix.smem_start; - len = PAGE_ALIGN((start & ~PAGE_MASK) + info->fix.smem_len); -+ preempt_enable(); - if (off >= len) { - /* memory mapped io */ - off -= len; |