commit 1e4ca5e8c6cba8bf41960d8bebb838ffc6f0440a
Author: Jan Rękorajski <[email protected]>
Date: Sat Nov 15 18:35:10 2014 +0100
- up to 3.17.3
- removed patches applied upstream
kernel-fbcon-margins.patch | 29 -----------------------------
kernel-small_fixes.patch | 27 ---------------------------
kernel.spec | 8 +++-----
3 files changed, 3 insertions(+), 61 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index eaf4c5f..0ab3fee 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,9 +68,9 @@
%define have_pcmcia 0
%endif
-%define rel 2
+%define rel 1
%define basever 3.17
-%define postver .2
+%define postver .3
# define this to '-%{basever}' for longterm branch
%define versuffix %{nil}
@@ -116,7 +116,7 @@ Source0:
http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
# Source0-md5: fb30d0f29214d75cddd2faa94f73d5cf
%if "%{postver}" != ".0"
Patch0:
http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5: d694b8625f834791f5e02d7c9add1406
+# Patch0-md5: 13f495e3ce72ed6ccefb38591587a6ef
%endif
Source1: kernel.sysconfig
@@ -145,7 +145,6 @@ Source58: kernel-inittmpfs.config
#
http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.25-rc6.patch
Patch3: kernel-fbcondecor.patch
-Patch4: kernel-fbcon-margins.patch
Patch6: linux-wistron-nx.patch
# netfilter related stuff mostly based on patch-o-matic-ng
@@ -659,7 +658,6 @@ cd linux-%{basever}
%if %{with fbcondecor}
%patch3 -p1
%endif
-%patch4 -p1
%patch6 -p1
## netfilter
diff --git a/kernel-fbcon-margins.patch b/kernel-fbcon-margins.patch
deleted file mode 100644
index fd77379..0000000
--- a/kernel-fbcon-margins.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-This fixes "margin colour" (colour used to clear margins - e.g. a half of line
-at the bottom of 100x37 console on 800x600 framebuffer).
-
-I don't know what was the intention behind using attr_bgcol_ec() here, but it
-caused using of background colour of last erase character to clear margins -
-which definitely isn't what we want...
-This patch changes margin colour to black (or colour 0 in palette modes).
-
- -- Jakub Bogusz <[email protected]>
-
---- linux-2.6.9/drivers/video/console/bitblit.c.orig 2004-10-20
18:13:32.000000000 +0200
-+++ linux-2.6.9/drivers/video/console/bitblit.c 2004-10-20
18:22:35.153056112 +0200
-@@ -206,7 +206,6 @@
- static void bit_clear_margins(struct vc_data *vc, struct fb_info *info,
- int bottom_only)
- {
-- int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
- unsigned int cw = vc->vc_font.width;
- unsigned int ch = vc->vc_font.height;
- unsigned int rw = info->var.xres - (vc->vc_cols*cw);
-@@ -215,7 +214,7 @@
- unsigned int bs = info->var.yres - bh;
- struct fb_fillrect region;
-
-- region.color = attr_bgcol_ec(bgshift, vc, info);
-+ region.color = 0;
- region.rop = ROP_COPY;
-
- if (rw && !bottom_only) {
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 561fe81..d4b6034 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,30 +26,3 @@
exit
fi
done
---- a/arch/x86/kernel/acpi/boot.c
-+++ b/arch/x86/kernel/acpi/boot.c
-@@ -604,14 +604,18 @@ void __init acpi_pic_sci_set_trigger(unsigned int irq,
u16 trigger)
-
- int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp)
- {
-- int irq = mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC | IOAPIC_MAP_CHECK);
-+ int irq;
-
-- if (irq >= 0) {
-+ if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) {
-+ *irqp = gsi;
-+ } else {
-+ irq = mp_map_gsi_to_irq(gsi,
-+ IOAPIC_MAP_ALLOC | IOAPIC_MAP_CHECK);
-+ if (irq < 0)
-+ return -1;
- *irqp = irq;
-- return 0;
- }
--
-- return -1;
-+ return 0;
- }
- EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);
-
---
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/1e4ca5e8c6cba8bf41960d8bebb838ffc6f0440a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
