From c027d2347c0d393a1bb5b28667ca4fe120d53a41 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Wed, 24 Feb 2010 20:44:15 +0000 Subject: [PATCH] update to 2.6.33 disable 2 patches, one merged for sure so nuke orig taball generation without changes. svn path=/dists/trunk/linux-2.6/; revision=15270 --- debian/changelog | 2 +- debian/patches/bugfix/all/efifb_fix_v2.patch | 54 -------------------- debian/patches/series/base | 4 +- 3 files changed, 3 insertions(+), 57 deletions(-) delete mode 100644 debian/patches/bugfix/all/efifb_fix_v2.patch diff --git a/debian/changelog b/debian/changelog index cfb1c4c7e..b5b08b5f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux-2.6 (2.6.33~rc8-1~experimental.1) UNRELEASED; urgency=low +linux-2.6 (2.6.33-1~experimental.1) UNRELEASED; urgency=low * New upstream release. diff --git a/debian/patches/bugfix/all/efifb_fix_v2.patch b/debian/patches/bugfix/all/efifb_fix_v2.patch deleted file mode 100644 index 7291cfd19..000000000 --- a/debian/patches/bugfix/all/efifb_fix_v2.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Marcin Slusarz -Subject: [PATCH] efifb: fix framebuffer handoff - -Commit 4410f3910947dcea8672280b3adecd53cec4e85e -(fbdev: add support for handoff from firmware to hw framebuffers) -for unknown reason didn't add fb_destroy operation to efifb. -Change aperture_size to match size passed to request_mem_region. - -See: http://bugzilla.kernel.org/show_bug.cgi?id=15151 - -Reported-by: Alex Zhavnerchik -Tested-by: Alex Zhavnerchik -Cc: Dave Airlie -Cc: linux-fbdev@vger.kernel.org -Cc: dri-devel@lists.sourceforge.net -Signed-off-by: Marcin Slusarz ---- - drivers/video/efifb.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c -index eb12182..d25df51 100644 ---- a/drivers/video/efifb.c -+++ b/drivers/video/efifb.c -@@ -161,8 +161,17 @@ static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green, - return 0; - } - -+static void efifb_destroy(struct fb_info *info) -+{ -+ if (info->screen_base) -+ iounmap(info->screen_base); -+ release_mem_region(info->aperture_base, info->aperture_size); -+ framebuffer_release(info); -+} -+ - static struct fb_ops efifb_ops = { - .owner = THIS_MODULE, -+ .fb_destroy = efifb_destroy, - .fb_setcolreg = efifb_setcolreg, - .fb_fillrect = cfb_fillrect, - .fb_copyarea = cfb_copyarea, -@@ -281,7 +290,7 @@ static int __init efifb_probe(struct platform_device *dev) - info->par = NULL; - - info->aperture_base = efifb_fix.smem_start; -- info->aperture_size = size_total; -+ info->aperture_size = size_remap; - - info->screen_base = ioremap(efifb_fix.smem_start, efifb_fix.smem_len); - if (!info->screen_base) { --- -1.6.6 - diff --git a/debian/patches/series/base b/debian/patches/series/base index 1734d9ddd..6a537950d 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -45,7 +45,8 @@ + bugfix/ia64/ia64-Include-linux-personality.h-header-in-asm-fcntl.patch -+ bugfix/all/cxusb-Select-all-required-frontend-and-tuner-modules.patch +# FIXME: check +#+ bugfix/all/cxusb-Select-all-required-frontend-and-tuner-modules.patch + bugfix/x86/kvm-fix-memory-access-during-x86-emulation.patch + bugfix/x86/kvm-Check-IOPL-level-during-io-instruction-emulation.patch @@ -53,4 +54,3 @@ + bugfix/x86/kvm-Check-CPL-level-during-privilege-instruction-emulation.patch + debian/sysrq-mask.patch -+ bugfix/all/efifb_fix_v2.patch