diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-03-02 19:20:51 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-03-02 19:20:51 -0500 |
| commit | 95e9f0bf422408eb10f696c4b77cbaa9540adfbf (patch) | |
| tree | f68b1ccd693e8ead1dbdbde2e643005f431bd0e2 | |
| parent | d7c8f96f0d49eefe7526b3c1e3cb81c46c8c5658 (diff) | |
| parent | 3855f621276fe55a5f073f74f5e10db3f540f188 (diff) | |
| download | rt-patches-95e9f0bf422408eb10f696c4b77cbaa9540adfbf.tar.gz | |
Merge branch 'v2.6.33-rt' into master
Nothing to see here. Just merging the commits for
deleting the two patches that break x86_32 and the removal
of some whitespace from console-rt patch.
| -rw-r--r-- | console-rt-support.patch | 23 | ||||
| -rw-r--r-- | series | 2 | ||||
| -rw-r--r-- | x86-Fix-iomap_atomic-with-highmem-y-again.patch | 27 | ||||
| -rw-r--r-- | x86-Fix-the-highmem-fallout-really.patch | 28 |
4 files changed, 1 insertions, 79 deletions
diff --git a/console-rt-support.patch b/console-rt-support.patch index 9a2bab7..41b49e9 100644 --- a/console-rt-support.patch +++ b/console-rt-support.patch @@ -12,28 +12,7 @@ diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 3681c6a..e037da3 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c -@@ -1226,7 +1226,6 @@ static void fbcon_clear(struct vc_data *vc, int sy, int sx, int height, - { - struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]]; - struct fbcon_ops *ops = info->fbcon_par; -- - struct display *p = &fb_display[vc->vc_num]; - u_int y_break; - -@@ -1258,10 +1257,11 @@ static void fbcon_putcs(struct vc_data *vc, const unsigned short *s, - struct display *p = &fb_display[vc->vc_num]; - struct fbcon_ops *ops = info->fbcon_par; - -- if (!fbcon_is_inactive(vc, info)) -+ if (!fbcon_is_inactive(vc, info)) { - ops->putcs(vc, info, s, count, real_y(p, ypos), xpos, - get_color(vc, info, scr_readw(s), 1), - get_color(vc, info, scr_readw(s), 0)); -+ } - } - - static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos) -@@ -3258,6 +3258,7 @@ static const struct consw fb_con = { +@@ -3225,6 +3225,7 @@ static const struct consw fb_con = { .con_screen_pos = fbcon_screen_pos, .con_getxy = fbcon_getxy, .con_resize = fbcon_resize, @@ -411,11 +411,9 @@ USB-Fix-the-mouse-problem-when-copying-large-amounts.patch # v2.6.33-rt5.patch # v2.6.33-rt6.patch # v2.6.33-rt7.patch -x86-Fix-iomap_atomic-with-highmem-y-again.patch sched-Break-out-from-load_balancing-on-rq_lock-conte.patch # v2.6.33-rt8.patch # v2.6.33.1-rt9.patch -x86-Fix-the-highmem-fallout-really.patch # v2.6.33.1-rt10.patch ARM-Eliminate-decompressor-Dstatic-PIC-hack.patch sched-Fix-pick_next_highest_task_rt-for-cgroups.patch diff --git a/x86-Fix-iomap_atomic-with-highmem-y-again.patch b/x86-Fix-iomap_atomic-with-highmem-y-again.patch deleted file mode 100644 index ec8ad5e..0000000 --- a/x86-Fix-iomap_atomic-with-highmem-y-again.patch +++ /dev/null @@ -1,27 +0,0 @@ -From cd4ac9b7a1c80cfcd9b8e76a1f6855a0329d982f Mon Sep 17 00:00:00 2001 -From: Thomas Gleixner <tglx@linutronix.de> -Date: Tue, 16 Mar 2010 13:52:03 -0700 -Subject: [PATCH] x86: Fix iomap_atomic with highmem=y again - -commit cd4ac9b7a1c80cfcd9b8e76a1f6855a0329d982f in tip. - -This whole highmem mess is racking my nerves ! - -Signed-off-by: Thomas Gleixner <tglx@linutronix.de> - -diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig -index f039584..ec97339 100644 ---- a/arch/x86/Kconfig -+++ b/arch/x86/Kconfig -@@ -2081,7 +2081,7 @@ endmenu - - config HAVE_ATOMIC_IOMAP - def_bool y -- depends on X86_32 && !PREEMPT_RT -+ depends on X86_32 && (!PREEMPT_RT || HIGHMEM) - - source "net/Kconfig" - --- -1.7.1.1 - diff --git a/x86-Fix-the-highmem-fallout-really.patch b/x86-Fix-the-highmem-fallout-really.patch deleted file mode 100644 index 7010c35..0000000 --- a/x86-Fix-the-highmem-fallout-really.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e89fab2bf44afccaa48ffb8ae33c03f4f3dcd208 Mon Sep 17 00:00:00 2001 -From: Thomas Gleixner <tglx@linutronix.de> -Date: Wed, 17 Mar 2010 15:47:14 -0700 -Subject: [PATCH] x86: Fix the highmem fallout really - -commit e89fab2bf44afccaa48ffb8ae33c03f4f3dcd208 in tip. - -Bah, forgot to fix iomap_32.c along with the Kconfig - -Signed-off-by: Thomas Gleixner <tglx@linutronix.de> - -diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c -index c889bad..d4fe51a 100644 ---- a/arch/x86/mm/iomap_32.c -+++ b/arch/x86/mm/iomap_32.c -@@ -97,8 +97,7 @@ void __kunmap_atomic(void *kvaddr, enum km_type type) - } - EXPORT_SYMBOL(__kunmap_atomic); - -- --#ifndef CONFIG_PREEMPT_RT -+#if !defined(CONFIG_PREEMPT_RT) || defined(CONFIG_HIGHMEM) - - # ifndef CONFIG_HIGHMEM - # define kmap_atomic_prot_pfn(pfn, type, prot) \ --- -1.7.1.1 - |