[meego-commits] 24386: Changes to MeeGo:1.2.0:oss:Update:Testing/kernel-adaptation-connext2
jieyang
no_reply at build.meego.com
Wed Oct 26 14:01:30 UTC 2011
Hi,
I have made the following changes to kernel-adaptation-connext2 in project MeeGo:1.2.0:oss:Update:Testing. Please review and accept ASAP.
Thank You,
jieyang
[This message was auto-generated]
---
Request #24386:
submit: devel:kernel:1.2/kernel-adaptation-connext2(r4)(update) -> MeeGo:1.2.0:oss:Update:Testing/kernel-adaptation-connext2
Message:
Reworked EMGD kernel patch to support 3.0/2.6.39 kernel. BMC #23644
State: new 2011-10-26T06:48:07 jieyang
Comment: None
changes files:
--------------
--- kernel-adaptation-connext2.changes
+++ kernel-adaptation-connext2.changes
@@ -1,2 +1,8 @@
--------------------------------------------------------------------
-Tue Oct 25 03:57:45 UTC 2011 - tracy.graydon at intel.com
+* Wed Oct 26 2011 Liu Xinyun <xinyun.liu at intel.com> - 2.6.39.4
+- Reworked linux-2.6.37-emgd-0005-support-3.0.3-kernel.patch.
+- Fixed #23703
+
+* Wed Oct 26 00:34:53 UTC 2011 - tracy.graydon at intel.com
+- Added missing fastinit support back in. More of BMC#23644 fixing.
+
+* Tue Oct 25 03:57:45 UTC 2011 - tracy.graydon at intel.com
spec files:
-----------
--- kernel-adaptation-connext2.spec
+++ kernel-adaptation-connext2.spec
@@ -89,7 +89,7 @@
# Packages that need to be installed before the kernel is, because the %post
# scripts use them.
#
-%define kernel_prereq fileutils, module-init-tools, mkinitrd >= 6.0.39-1
+%define kernel_prereq fileutils, module-init-tools, fastinit, mkinitrd >= 6.0.39-1
#
# This macro does requires, provides, conflicts, obsoletes for a kernel package.
other changes:
--------------
++++++ kernel.spec.in
--- kernel.spec.in
+++ kernel.spec.in
@@ -89,7 +89,7 @@
# Packages that need to be installed before the kernel is, because the %post
# scripts use them.
#
-%define kernel_prereq fileutils, module-init-tools, mkinitrd >= 6.0.39-1
+%define kernel_prereq fileutils, module-init-tools, fastinit, mkinitrd >= 6.0.39-1
#
# This macro does requires, provides, conflicts, obsoletes for a kernel package.
++++++ linux-2.6.37-emgd-0005-support-3.0.3-kernel.patch
--- linux-2.6.37-emgd-0005-support-3.0.3-kernel.patch
+++ linux-2.6.37-emgd-0005-support-3.0.3-kernel.patch
@@ -1,38 +1,3 @@
-From 0fa0fc02a9f46ce6804d0769ac0cf01698256074 Mon Sep 17 00:00:00 2001
-From: Liu, Xinyun <xinyunliu at gmail.com>
-Date: Wed, 19 Oct 2011 13:51:18 +0800
-Subject: [PATCH] Add support for kernel 3.0.3.
-
- Changes should be backward compatible as far as 2.6.35 at least.
----
- .../emgd/emgd/core/init/tnc/micro_init_tnc.c | 12 +++---
- drivers/staging/emgd/emgd/display/dsp/cmn/dsp.c | 34 +++++++++---------
- .../staging/emgd/emgd/display/mode/plb/mode_plb.c | 22 ++++++------
- .../emgd/emgd/display/mode/tnc/micro_mode_tnc.c | 13 +++----
- .../staging/emgd/emgd/display/mode/tnc/mode_tnc.c | 22 ++++++------
- drivers/staging/emgd/emgd/drm/emgd_drv.c | 32 +++++++++++++++---
- drivers/staging/emgd/emgd/drm/emgd_interface.c | 36 ++++++++++----------
- .../staging/emgd/emgd/include/plb/state3d_plb.h | 8 ++--
- drivers/staging/emgd/emgd/pal/lvds/lvds.c | 2 +-
- drivers/staging/emgd/emgd/pal/sdvo/sdvo_port.c | 2 +-
- .../emgd/emgd/video/overlay/plb/micro_ovl_plb.c | 36 ++++++++++----------
- .../emgd/emgd/video/overlay/tnc/micro_ovl_tnc.c | 34 +++++++++---------
- drivers/staging/emgd/emgd/video/topaz/topaz_init.c | 8 ++--
- drivers/staging/emgd/include/igd_errno.h | 14 ++++----
- .../emgd/pvr/services4/srvkm/common/deviceclass.c | 32 +++++++++---------
- .../staging/emgd/pvr/services4/srvkm/common/hash.c | 4 +-
- .../emgd/pvr/services4/srvkm/common/resman.c | 3 --
- .../emgd/pvr/services4/srvkm/env/linux/event.c | 4 --
- .../emgd/pvr/services4/srvkm/env/linux/mm.c | 8 +---
- .../emgd/pvr/services4/srvkm/env/linux/mm.h | 4 --
- .../emgd/pvr/services4/srvkm/env/linux/mmap.c | 10 ++----
- .../emgd/pvr/services4/srvkm/env/linux/module.c | 4 --
- .../emgd/pvr/services4/srvkm/env/linux/mutils.c | 3 --
- .../emgd/pvr/services4/srvkm/env/linux/mutils.h | 4 --
- .../emgd/pvr/services4/srvkm/env/linux/osfunc.c | 10 +++---
- .../emgd/pvr/services4/srvkm/env/linux/proc.c | 6 +---
- 26 files changed, 177 insertions(+), 190 deletions(-)
-
diff --git a/drivers/staging/emgd/emgd/core/init/tnc/micro_init_tnc.c b/drivers/staging/emgd/emgd/core/init/tnc/micro_init_tnc.c
index 5b931a3..4ef9eaf 100644
--- a/drivers/staging/emgd/emgd/core/init/tnc/micro_init_tnc.c
@@ -964,6 +929,42 @@
}
}
---
-1.7.4.1
-
+diff --git a/drivers/staging/emgd/pvr/services4/srvkm/env/linux/pvr_debug.c b/drivers/staging/emgd/pvr/services4/srvkm/env/linux/pvr_debug.c
+index ac0d853..cfec4c2 100644
+--- a/drivers/staging/emgd/pvr/services4/srvkm/env/linux/pvr_debug.c
++++ b/drivers/staging/emgd/pvr/services4/srvkm/env/linux/pvr_debug.c
+@@ -21,10 +21,6 @@
+ ******************************************************************************/
+
+
+-#ifndef AUTOCONF_INCLUDED
+- #include <linux/config.h>
+-#endif
+-
+ #include <asm/io.h>
+ #include <asm/uaccess.h>
+ #include <linux/kernel.h>
+@@ -56,7 +52,7 @@ static IMG_CHAR gszBufferIRQ[PVR_MAX_MSG_LEN + 1];
+
+ static struct mutex gsDebugMutexNonIRQ;
+
+-static spinlock_t gsDebugLockIRQ = SPIN_LOCK_UNLOCKED;
++DEFINE_SPINLOCK(gsDebugLockIRQ);
+
+ #define USE_SPIN_LOCK (in_interrupt() || !preemptible())
+
+diff --git a/drivers/staging/emgd/pvr/services4/srvkm/env/linux/pvr_drm.c b/drivers/staging/emgd/pvr/services4/srvkm/env/linux/pvr_drm.c
+index 14a33fc..32771c6 100644
+--- a/drivers/staging/emgd/pvr/services4/srvkm/env/linux/pvr_drm.c
++++ b/drivers/staging/emgd/pvr/services4/srvkm/env/linux/pvr_drm.c
+@@ -22,10 +22,6 @@
+
+ #if defined(SUPPORT_DRI_DRM)
+
+-#ifndef AUTOCONF_INCLUDED
+- #include <linux/config.h>
+-#endif
+-
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
More information about the MeeGo-commits
mailing list